[jboss-cvs] JBossAS SVN: r85252 - in trunk/system/src: tests/org/jboss/test/server/profileservice/persistence/remove/test and 1 other directory.

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

Author: emuckenhuber
Date: 2009-03-04 15:36:27 -0500 (Wed, 04 Mar 2009)
New Revision: 85252

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectOverride.java
   trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java
Log:
disable checking for equal metaTypes

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectOverride.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectOverride.java	2009-03-04 20:13:57 UTC (rev 85251)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectOverride.java	2009-03-04 20:36:27 UTC (rev 85252)
@@ -148,13 +148,13 @@
       if (original.getMetaType() == null)
          throw new IllegalStateException("Original meta value is null " + original);
 
-      if (original.getMetaType().getTypeName().equals(override.getMetaType().getTypeName()) == false)
-      {
-         // On generic values the restored is different from the original
-         if(original.getMetaType().isGeneric() == false)
-            throw new RuntimeException("Cannot merge two different types original: " + original.getMetaType()
-                  + " override: " + override.getMetaType());
-      }
+//      if (original.getMetaType().getTypeName().equals(override.getMetaType().getTypeName()) == false)
+//      {
+//         // On generic values the restored is different from the original
+//         if(original.getMetaType().isGeneric() == false)
+//            throw new RuntimeException("Cannot merge two different types original: " + original.getMetaType()
+//                  + " override: " + override.getMetaType());
+//      }
          
 
       // Now try to merge

Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java	2009-03-04 20:13:57 UTC (rev 85251)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java	2009-03-04 20:36:27 UTC (rev 85252)
@@ -25,8 +25,6 @@
 import java.util.List;
 
 import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.metatype.api.values.CollectionValue;
 import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
 import org.jboss.system.server.profileservice.persistence.ManagedObjectPeristenceHandler;
 import org.jboss.system.server.profileservice.persistence.xml.ModificationInfo;
@@ -36,7 +34,6 @@
 import org.jboss.test.server.profileservice.persistence.support.GenericSupportMetaData;
 import org.jboss.test.server.profileservice.persistence.support.SimpleGenericMetaData;
 import org.jboss.test.server.profileservice.persistence.test.AbstractPersistenceFormatTest;
-import org.jboss.test.server.profileservice.persistence.test.CollectionValueUnitTestCase;
 
 /**
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>