cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r782181 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
Date Sat, 06 Jun 2009 02:06:31 GMT
Author: dkulp
Date: Sat Jun  6 02:06:30 2009
New Revision: 782181

URL: http://svn.apache.org/viewvc?rev=782181&view=rev
Log:
Remove spurious printStackTrace() that shouldn't be there
Make sure same class isn't defined twice

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=782181&r1=782180&r2=782181&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java Sat Jun
 6 02:06:30 2009
@@ -190,7 +190,11 @@
             return defined.get(name.replace('/', '.'));
         }
         
-        public Class<?> defineClass(String name, byte bytes[]) {
+        public synchronized Class<?> defineClass(String name, byte bytes[]) {
+            Class<?> ret = defined.get(name.replace('/', '.'));
+            if (ret != null) {
+                return ret;
+            }
             if (name.endsWith("package-info")) {
                 Package p = super.getPackage(name.substring(0, name.length() - 13));
                 if (p == null) {
@@ -205,7 +209,7 @@
                 }
             }
             
-            Class<?> ret = super.defineClass(name.replace('/', '.'), bytes, 0, bytes.length);
+            ret = super.defineClass(name.replace('/', '.'), bytes, 0, bytes.length);
             defined.put(name.replace('/', '.'), ret);
             return ret;
         }

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java?rev=782181&r1=782180&r2=782181&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
Sat Jun  6 02:06:30 2009
@@ -140,7 +140,6 @@
             }
         } catch (Throwable e) {
             // ignore, we'll just fall down to reflection based
-            e.printStackTrace();
         }
         return null;
     }



Mime
View raw message