You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/10 22:24:57 UTC
svn commit: r1396773 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
Author: rmannibucau
Date: Wed Oct 10 20:24:57 2012
New Revision: 1396773
URL: http://svn.apache.org/viewvc?rev=1396773&view=rev
Log:
trying some protection for linkage error for mac os
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java?rev=1396773&r1=1396772&r2=1396773&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java Wed Oct 10 20:24:57 2012
@@ -93,6 +93,18 @@ public class ApplicationComposer extends
super(klass);
testClass = new TestClass(klass);
validate();
+ linkageErrorProtection();
+ }
+
+ private void linkageErrorProtection() {
+ final ClassLoader loader = getClass().getClassLoader();
+ try {
+ Class.forName("sun.security.pkcs11.SunPKCS11", true, loader);
+ Class.forName("sun.security.pkcs11.SunPKCS11$Descriptor", true, loader);
+ Class.forName("sun.security.pkcs11.wrapper.PKCS11Exception", true, loader);
+ } catch (Throwable e) {
+ // no-op: not an issue
+ }
}
private void validate() throws InitializationError {
@@ -384,10 +396,6 @@ public class ApplicationComposer extends
final InjectionProcessor processor = new InjectionProcessor(testInstance, context.getInjections(), context.getJndiContext());
processor.createInstance();
-// load("org.apache.webbeans.component.AbstractOwbBean");
-// load("sun.security.pkcs11.SunPKCS11");
-// load("sun.security.pkcs11.SunPKCS11$Descriptor");
-// load("sun.security.pkcs11.wrapper.PKCS11Exception");
try {
OWBInjector.inject(appContext.getBeanManager(), testInstance, null);
} catch (Throwable t) {