Merge jdk7u55-b10 into jdk7u55-b11
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index d8a589d..b96e929 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -408,3 +408,4 @@
f617c33f98e1941875457c5c227198c52917942e jdk7u55-b08
1f02b1889f7098c1e6fdd271ef74c62a2e346b28 jdk7u55-b09
736c951b19b9562830f61d5ebbad78775f200e94 jdk7u55-b09
+2a55bbab15f6c866281003dcf48708a9d8c145e9 jdk7u55-b10
diff --git a/corba/.hgtags b/corba/.hgtags
index 267572c..8be3c8a 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -411,3 +411,4 @@
aa98fb8dc3608a30ac593635b21aca2105aaab20 jdk7u55-b08
2a4842e7ca0b2228017542cea0fed3b8d4f4491a jdk7u55-b09
5805c3291eb3a82cd75e95ac06eb13daa7f92866 jdk7u55-b09
+b9dae31c56a2bf69fc5932cc490cd80fccc1e0fd jdk7u55-b10
diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java b/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
index d2eddfb..fcbc0fd 100644
--- a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
+++ b/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -170,6 +170,12 @@
// representing LogDomain and ExceptionGroup.
private Map wrapperMap ;
+ static class Holder {
+ static final PresentationManager defaultPresentationManager =
+ setupPresentationManager();
+ }
+ private static final Object pmLock = new Object();
+
private static Map staticWrapperMap = new ConcurrentHashMap();
protected MonitoringManager monitoringManager;
@@ -235,13 +241,24 @@
*/
public static PresentationManager getPresentationManager()
{
- AppContext ac = AppContext.getAppContext();
- PresentationManager pm = (PresentationManager) ac.get(PresentationManager.class);
- if (pm == null) {
- pm = setupPresentationManager();
- ac.put(PresentationManager.class, pm);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null && AppContext.getAppContexts().size() > 0) {
+ AppContext ac = AppContext.getAppContext();
+ if (ac != null) {
+ synchronized (pmLock) {
+ PresentationManager pm =
+ (PresentationManager) ac.get(PresentationManager.class);
+ if (pm == null) {
+ pm = setupPresentationManager();
+ ac.put(PresentationManager.class, pm);
+ }
+ return pm;
+ }
+ }
}
- return pm;
+
+ // No security manager or AppContext
+ return Holder.defaultPresentationManager;
}
/** Get the appropriate StubFactoryFactory. This
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 4d2e873..7c03d8c 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -620,3 +620,4 @@
049fd2cef85bf2d557dd7dd8a90a6831a8168ce4 jdk7u55-b08
9b238ab164e6d1cf9cfb560827d88ef8a7d8c898 jdk7u55-b09
573d8d080af9eff48aa3b8f0696d8874ce36fbb1 jdk7u55-b09
+36f8bd4dd467ae4183340842fd7158ac3309b826 jdk7u55-b10
diff --git a/hotspot/make/bsd/makefiles/arm.make b/hotspot/make/bsd/makefiles/arm.make
index e22d5c3..f35f70a 100644
--- a/hotspot/make/bsd/makefiles/arm.make
+++ b/hotspot/make/bsd/makefiles/arm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, 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
@@ -24,6 +24,8 @@
Obj_Files += bsd_arm.o
-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+ifneq ($(EXT_LIBS_PATH),)
+ LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+endif
CFLAGS += -DVM_LITTLE_ENDIAN
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index 1146033..9ecc723 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
@@ -35,7 +35,7 @@
HS_MAJOR_VER=24
HS_MINOR_VER=55
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=02
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
diff --git a/hotspot/make/linux/makefiles/arm.make b/hotspot/make/linux/makefiles/arm.make
index 6d7079e..ff8e3c5 100644
--- a/hotspot/make/linux/makefiles/arm.make
+++ b/hotspot/make/linux/makefiles/arm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, 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
@@ -24,6 +24,8 @@
Obj_Files += linux_arm.o
-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+ifneq ($(EXT_LIBS_PATH),)
+ LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+endif
CFLAGS += -DVM_LITTLE_ENDIAN
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index d20e63b..43d06aa 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -411,3 +411,4 @@
39337c00cb3ce29b4d67f6d247c3fa80f16cb49f jdk7u55-b08
537f4f609132f3d6a4ce506c98f1dbd57f1320f8 jdk7u55-b09
997bdd44d5de4aee319ff0a0d2892a912d9de6f5 jdk7u55-b09
+606483a43e8b6317d84922b9ed2b2c30d9e77419 jdk7u55-b10
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 9603509..ffbc3da 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -411,3 +411,4 @@
57ba92e96b7fb6f4543038c1daa390c45d8a9d84 jdk7u55-b08
c9d8555964a581486f4c8e1bf5f5db678eb3b9f2 jdk7u55-b09
0f469a7307b98e911aaaab8cad781eab3bd94ad6 jdk7u55-b09
+1080e907d64ab63c6138b1a61d9e5b826e83634a jdk7u55-b10
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 335487e..96e4c70 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -395,3 +395,4 @@
db1323224053a18ecc62bdc1d3902d93b33f0b70 jdk7u55-b08
534eeff29ac9fcbbb99ef8908548dbb368d04baf jdk7u55-b09
d39dd4135844ca5c707bc39ae1d7e020d49880ce jdk7u55-b09
+b231536550067c3b00c77d0e035afe8faaa15581 jdk7u55-b10
diff --git a/jdk/make/common/Defs-embedded.gmk b/jdk/make/common/Defs-embedded.gmk
index 6e06533..2d92401 100644
--- a/jdk/make/common/Defs-embedded.gmk
+++ b/jdk/make/common/Defs-embedded.gmk
@@ -71,7 +71,9 @@
# and it must be linked after fdlibm - this places it at the end after libc
# -z muldefs avoids linker errors for duplicate symbols.
ifeq ($(CROSS_COMPILE_ARCH), arm)
- EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
+ ifneq ($(EXT_LIBS_PATH),)
+ EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
+ endif
endif
endif
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 0250d94..a22ce3a 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -410,3 +410,4 @@
08f7914d6aa947e73269b4e60110ed12573ffa28 jdk7u55-b07
e64301b473b43609cb28d8cfe7e5db17d9bf8a4a jdk7u55-b08
a296112a3fd774c258375912c7ada38daf8eee1e jdk7u55-b09
+faa9f8c51a6e3fcb444729012a798e3ad09c3da4 jdk7u55-b10
