Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
7085c333
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7085c333
编写于
10月 06, 2015
作者:
L
lana
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
9d33caf5
1afd62ba
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
56 deletion
+4
-56
corba/make/CompileInterim.gmk
corba/make/CompileInterim.gmk
+0
-55
corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java
...ava.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java
+4
-1
未找到文件。
corba/make/CompileInterim.gmk
已删除
100644 → 0
浏览文件 @
9d33caf5
#
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# This must be the first rule
default: all
include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
include SetupJavaCompilers.gmk
################################################################################
$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
SETUP := GENERATE_OLDBYTECODE, \
SRC := $(JDK_TOPDIR)/src/jdk.rmic/share/classes \
$(CORBA_TOPDIR)/src/java.corba/share/classes \
$(CORBA_TOPDIR)/src/jdk.rmic/share/classes \
$(SUPPORT_OUTPUTDIR)/gensrc/java.corba, \
EXCLUDES := com/sun/corba/se/PortableActivationIDL, \
EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
org/omg/PortableInterceptor/UNKNOWN.java \
com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
COPY := .prp, \
CLEAN := .properties, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/corba_interim_classes, \
JAR := $(INTERIM_CORBA_JAR)))
################################################################################
all: $(BUILD_INTERIM_CORBA)
corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java
浏览文件 @
7085c333
...
...
@@ -89,6 +89,9 @@ import com.sun.corba.se.impl.logging.OMGSystemException ;
import
com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl
;
import
jdk.internal.misc.JavaAWTAccess
;
import
jdk.internal.misc.SharedSecrets
;
public
abstract
class
ORB
extends
com
.
sun
.
corba
.
se
.
org
.
omg
.
CORBA
.
ORB
implements
Broker
,
TypeCodeFactory
{
...
...
@@ -202,7 +205,7 @@ public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
public
static
PresentationManager
getPresentationManager
()
{
SecurityManager
sm
=
System
.
getSecurityManager
();
sun
.
misc
.
JavaAWTAccess
javaAwtAccess
=
sun
.
misc
.
SharedSecrets
.
getJavaAWTAccess
();
JavaAWTAccess
javaAwtAccess
=
SharedSecrets
.
getJavaAWTAccess
();
if
(
sm
!=
null
&&
javaAwtAccess
!=
null
)
{
final
Object
appletContext
=
javaAwtAccess
.
getAppletContext
();
if
(
appletContext
!=
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录