[jbossws-commits] JBossWS SVN: r18796 - stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment.

[jbossws-commits at lists.jboss.org]

Author: rsearls
Date: 2014-07-11 09:54:46 -0400 (Fri, 11 Jul 2014)
New Revision: 18796

Modified:
   stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java
   stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/ContentHandlerRegistry.java
Log:
[bz-1104273] revision, address issue of multilple calls to AttachmentPartImpl

Modified: stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java	2014-07-11 11:03:48 UTC (rev 18795)
+++ stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java	2014-07-11 13:54:46 UTC (rev 18796)
@@ -65,7 +65,9 @@
    public AttachmentPartImpl()
    {
        // Load JAF content handlers
-       ContentHandlerRegistry.register();
+      if (!ContentHandlerRegistry.isRegistered()) {
+         ContentHandlerRegistry.register();
+      }
    }
 
    public AttachmentPartImpl(DataHandler handler)

Modified: stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/ContentHandlerRegistry.java
===================================================================
--- stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/ContentHandlerRegistry.java	2014-07-11 11:03:48 UTC (rev 18795)
+++ stack/native/branches/jbossws-native-4.2.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/ContentHandlerRegistry.java	2014-07-11 13:54:46 UTC (rev 18796)
@@ -58,7 +58,9 @@
       addRegistryEntry(text_html.class);
       addRegistryEntry(multipart_mixed.class);
    }
-   
+
+   private static boolean isRegistered = false; // bz-1104273 workaround
+
    private static void addRegistryEntry(Class contentHandler) 
    {
       handlerRegistry.add(contentHandler);
@@ -99,5 +101,11 @@
       Iterator i = handlerRegistry.iterator();
       while (i.hasNext())
          registerContentHandler((Class) i.next());
-   }   
+      isRegistered = true;
+   }
+
+   public static boolean isRegistered()
+   {
+      return isRegistered;
+   }
 }