You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by sb...@apache.org on 2018/02/16 00:37:33 UTC
svn commit: r1824392 - in /aries/branches/java6support/jndi: ./
jndi-bundle/pom.xml
jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java
Author: sbratton
Date: Fri Feb 16 00:37:33 2018
New Revision: 1824392
URL: http://svn.apache.org/viewvc?rev=1824392&view=rev
Log:
Merge ^/aries/trunk/jndi into java6support/jndi r1784176 through r1824375
Modified:
aries/branches/java6support/jndi/ (props changed)
aries/branches/java6support/jndi/jndi-bundle/pom.xml
aries/branches/java6support/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java
Propchange: aries/branches/java6support/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 16 00:37:33 2018
@@ -1,3 +1,3 @@
/aries/branches/1.0-prototype/jndi:1306564-1337594
/aries/branches/dec-2011-jndi-release/jndi:1209408-1228277
-/aries/trunk/jndi:1728111-1784175
+/aries/trunk/jndi:1728111-1824375
Modified: aries/branches/java6support/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/jndi/jndi-bundle/pom.xml?rev=1824392&r1=1824391&r2=1824392&view=diff
==============================================================================
--- aries/branches/java6support/jndi/jndi-bundle/pom.xml (original)
+++ aries/branches/java6support/jndi/jndi-bundle/pom.xml Fri Feb 16 00:37:33 2018
@@ -240,6 +240,7 @@
<minmemory>128m</minmemory>
<maxmemory>512m</maxmemory>
<sourcepath>${project.build.directory}/sources</sourcepath>
+ <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
Modified: aries/branches/java6support/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java?rev=1824392&r1=1824391&r2=1824392&view=diff
==============================================================================
--- aries/branches/java6support/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java (original)
+++ aries/branches/java6support/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java Fri Feb 16 00:37:33 2018
@@ -18,6 +18,8 @@
*/
package org.apache.aries.jndi;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Hashtable;
import javax.naming.Context;
@@ -29,17 +31,21 @@ public class JREInitialContextFactoryBui
public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment)
throws NamingException {
- String contextFactoryClass = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
+ final String contextFactoryClass = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
if (contextFactoryClass != null) {
- try {
- @SuppressWarnings("unchecked")
- Class<? extends InitialContextFactory> clazz = (Class<? extends InitialContextFactory>) ClassLoader.getSystemClassLoader().loadClass(contextFactoryClass);
- return InitialContextFactory.class.cast(clazz.newInstance());
- } catch (Exception e) {
- return null;
- }
+ return AccessController.doPrivileged(new PrivilegedAction<InitialContextFactory>() {
+ public InitialContextFactory run() {
+ try {
+ @SuppressWarnings("unchecked")
+ Class<? extends InitialContextFactory> clazz = (Class<? extends InitialContextFactory>) ClassLoader.
+ getSystemClassLoader().loadClass(contextFactoryClass);
+ return InitialContextFactory.class.cast(clazz.newInstance());
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ });
}
return null;
- }
-
+ }
}