cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r782747 - in /cxf/branches/2.1.x-fixes: ./ 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 Mon, 08 Jun 2009 19:48:22 GMT
Author: dkulp
Date: Mon Jun  8 19:48:22 2009
New Revision: 782747

URL: http://svn.apache.org/viewvc?rev=782747&view=rev
Log:
Merged revisions 782181 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

........
  r782181 | dkulp | 2009-06-05 22:06:30 -0400 (Fri, 05 Jun 2009) | 2 lines
  
  Remove spurious printStackTrace() that shouldn't be there
  Make sure same class isn't defined twice
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
    cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  8 19:48:22 2009
@@ -1 +1,2 @@
 /cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841
+/cxf/trunk:782181

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=782747&r1=782746&r2=782747&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
Mon Jun  8 19:48:22 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/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java?rev=782747&r1=782746&r2=782747&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
Mon Jun  8 19:48:22 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