diff options
| -rw-r--r-- | src/main/java/com/c2kernel/persistency/ProxyLoader.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/utils/CastorXMLUtility.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/persistency/ProxyLoader.java b/src/main/java/com/c2kernel/persistency/ProxyLoader.java index e93c1ff..ab3b9d2 100644 --- a/src/main/java/com/c2kernel/persistency/ProxyLoader.java +++ b/src/main/java/com/c2kernel/persistency/ProxyLoader.java @@ -61,7 +61,7 @@ public class ProxyLoader extends ClusterStorage { return (C2KLocalObject)Gateway.getMarshaller().unmarshall(queryData);
}
} catch (Exception e) {
- //Logger.error(e);
+ if (Logger.doLog(7)) Logger.error(e);
throw new ClusterStorageException(e.getMessage());
}
return null;
diff --git a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java index 4839fa3..6a9350f 100644 --- a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java +++ b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java @@ -57,6 +57,15 @@ public class CastorXMLUtility throw new InvalidDataException("Error loading map '"+thisMap+"'", "");
}
}
+
+ // Test the maps now, instead of on first use.
+
+ try {
+ new Unmarshaller( mMapping );
+ } catch (MappingException e) {
+ Logger.error(e);
+ throw new InvalidDataException("Castor mapfiles are not valid", "");
+ }
Logger.msg(1, "Loaded all maps from "+mapURL.toString());
}
|