2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/c2kernel/persistency/ProxyLoader.java b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
index e614b0d..e93c1ff 100644
--- a/src/main/java/com/c2kernel/persistency/ProxyLoader.java
+++ b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
@@ -10,7 +10,6 @@ import com.c2kernel.lookup.EntityPath;
 import com.c2kernel.lookup.LDAPLookup;
 import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorXMLUtility;
 import com.c2kernel.utils.Logger;
 
 /** Used by proxies to load clusters by queryData from the Entity.
@@ -59,7 +58,7 @@ public class ProxyLoader extends ClusterStorage {
                 if (type.equals(OUTCOME))
                     return new Outcome(path, queryData);
                 else
-                    return (C2KLocalObject)CastorXMLUtility.unmarshall(queryData);
+                    return (C2KLocalObject)Gateway.getMarshaller().unmarshall(queryData);
             }
         } catch (Exception e) {
             //Logger.error(e);
diff --git a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
index 01c7b90..056fe28 100644
--- a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
@@ -7,7 +7,6 @@ import com.c2kernel.lookup.EntityPath;
 import com.c2kernel.lookup.InvalidEntityPathException;
 import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorXMLUtility;
 import com.c2kernel.utils.FileStringUtility;
 import com.c2kernel.utils.Logger;
 
@@ -67,7 +66,7 @@ public class XMLClusterStorage extends ClusterStorage {
             if (type.equals("Outcome"))
                 return new Outcome(path, objString);
             else {
-                C2KLocalObject obj = (C2KLocalObject)CastorXMLUtility.unmarshall(objString);
+                C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(objString);
                 return obj;
             }
 
@@ -83,7 +82,7 @@ public class XMLClusterStorage extends ClusterStorage {
         try {
             String filePath = getFilePath(sysKey, getPath(obj)+".xml");
             Logger.msg(7, "Writing "+filePath);
-            String data = CastorXMLUtility.marshall(obj);
+            String data = Gateway.getMarshaller().marshall(obj);
 
             String dir = filePath.substring(0, filePath.lastIndexOf('/'));
         if( !FileStringUtility.checkDir( dir ) ) {