servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1392946 - /servicemix/smx4/specs/trunk/saaj-api-1.3/src/main/java/javax/xml/soap/FactoryFinder.java
Date Tue, 02 Oct 2012 14:59:02 GMT
Author: dkulp
Date: Tue Oct  2 14:59:01 2012
New Revision: 1392946

URL: http://svn.apache.org/viewvc?rev=1392946&view=rev
Log:
[SMX4-1089] Apply fix for this to the new factoryfinder method as well.

Modified:
    servicemix/smx4/specs/trunk/saaj-api-1.3/src/main/java/javax/xml/soap/FactoryFinder.java

Modified: servicemix/smx4/specs/trunk/saaj-api-1.3/src/main/java/javax/xml/soap/FactoryFinder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/saaj-api-1.3/src/main/java/javax/xml/soap/FactoryFinder.java?rev=1392946&r1=1392945&r2=1392946&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/saaj-api-1.3/src/main/java/javax/xml/soap/FactoryFinder.java
(original)
+++ servicemix/smx4/specs/trunk/saaj-api-1.3/src/main/java/javax/xml/soap/FactoryFinder.java
Tue Oct  2 14:59:01 2012
@@ -81,7 +81,11 @@ class FactoryFinder {
      */
     static Object find(Class factory,
                        String defaultFactoryClassName) throws SOAPException {
-        return find(factory.getName(), factory, defaultFactoryClassName);
+        String factoryPropertyName = factory.getName();
+        if ("javax.xml.soap.SAAJMetaFactory".equals(factoryPropertyName)) {
+            factoryPropertyName = "javax.xml.soap.MetaFactory";
+        }
+        return find(factoryPropertyName, factory, defaultFactoryClassName);
     }
     /**
      * Instantiates a factory object given the factory's property name and the default class
name.
@@ -106,6 +110,7 @@ class FactoryFinder {
     static Object find(String factoryPropertyName,
                        Class factoryClass,
                        String defaultFactoryClassName) throws SOAPException {
+        
         try {
             // If we are deployed into an OSGi environment, leverage it
             if (factoryClass == null) {



Mime
View raw message