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/08/08 09:25:58 UTC
svn commit: r1370680 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Author: rmannibucau
Date: Wed Aug 8 07:25:57 2012
New Revision: 1370680
URL: http://svn.apache.org/viewvc?rev=1370680&view=rev
Log:
removing localbean interface dump in a file since it is now useless and matching ROOT webapp for StandardContextInfo
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java?rev=1370680&r1=1370679&r2=1370680&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java Wed Aug 8 07:25:57 2012
@@ -258,13 +258,7 @@ public class LocalBeanProxyGeneratorImpl
}
}
- byte[] clsBytes = cw.toByteArray();
- try {
- IO.copy(clsBytes, new File("/tmp/foo.class"));
- } catch (IOException e) {
- e.printStackTrace();
- }
- return clsBytes;
+ return cw.toByteArray();
}
/*
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1370680&r1=1370679&r2=1370680&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Wed Aug 8 07:25:57 2012
@@ -679,7 +679,8 @@ public class TomcatWebAppBuilder impleme
continue;
}
- if (standardContext.getName().equals("/" + webApp.contextRoot)) {
+ if (standardContext.getName().equals("/" + webApp.contextRoot)
+ || standardContext.getName().equals("/" + webApp.contextRoot)) { // ROOT for instance
return webApp;
}
}