new marshaller instance ensures we use marshalling properties and correct validation...

[vamsas.git] / src / uk / ac / vamsas / client / simpleclient / ClientDocument.java

diff --git a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
index 9513668..ef0a7d5 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
+++ b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
@@ -175,7 +175,8 @@ public class ClientDocument extends uk.ac.vamsas.client.ClientDocument implement
       // Should retrieve original version and compare - unless local hashes can be used to determine if resultSet has been truncated.
       // just do internal validation for moment.
       try {
-        newVersion.validate();
+        if (SimpleClientConfig.validateUpdatedRoots())
+          newVersion.validate();
         return true;
       }
       catch (Exception e)
@@ -188,7 +189,8 @@ public class ClientDocument extends uk.ac.vamsas.client.ClientDocument implement
       if (!newVersion.isRegistered())
         _registerObject(newVersion);
       try {
-        newVersion.validate();
+        if (SimpleClientConfig.validateMergedRoots())
+          newVersion.validate();
         return true;
       }
       catch (Exception e)