[jboss-cvs] JBossAS SVN: r77659 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2008-08-29 11:53:39 -0400 (Fri, 29 Aug 2008)
New Revision: 77659

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
Log:
JBAS-5902

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java	2008-08-29 15:35:21 UTC (rev 77658)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java	2008-08-29 15:53:39 UTC (rev 77659)
@@ -23,44 +23,31 @@
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.jboss.logging.Logger;
-import org.w3c.dom.Element;
 
 /**
  * A ManagedConnectionEmptyContentAdapter.
  * 
  * @author <a href="weston.price at jboss.org">Weston Price</a>
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
  * @version $Revision: 1.1 $
  */
-public class ManagedConnectionEmptyContentAdapter extends XmlAdapter<Object, Boolean>
+public class ManagedConnectionEmptyContentAdapter extends XmlAdapter<ManagedConnectionEmptyContentAdapter.EmptyElement, Boolean>
 {
-   private static Logger log = Logger.getLogger(ManagedConnectionEmptyContentAdapter.class);
-   
+   public static class EmptyElement
+   {
+      public static EmptyElement INSTANCE = new EmptyElement();
+      private EmptyElement(){}
+   }
+
    @Override
-   public Boolean unmarshal(Object obj) throws Exception
-   {      
-      Element e = (Element)obj;
-      Boolean results = Boolean.FALSE;
-      
-      String node = e.getNodeName();
-      if (node.equals("interleaving") || node.equals("no-tx-separate-pools")
-            || node.equals("local-transaction") || node.equals("use-strict-min") || node.equals("xa-transaction"))
-      {
-         results = Boolean.TRUE;
-      }               
-      
-      if(node.equals("track-connection-by-tx"))
-      {
-         log.warn("<track-connection-by-tx/> is deprecated and is now assumed to be present by default (JBAS-5203)");
-         results = Boolean.TRUE;
-      }
-      
-      return results;
+   public EmptyElement marshal(Boolean v) throws Exception
+   {
+      return Boolean.TRUE.equals(v) ? EmptyElement.INSTANCE : null;
    }
 
    @Override
-   public Object marshal(Boolean b) throws Exception
+   public Boolean unmarshal(EmptyElement v) throws Exception
    {
-      return null;
+      return v == null ? Boolean.FALSE : Boolean.TRUE;
    }
 }