From cfa70de9ec7745356ed00c1502d5bd55eee14181 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Sun, 21 Sep 2014 17:49:43 +0200 Subject: Lost commits - NPE on ModuleResource.getVersion caused by bad autoboxing, and Olivier's classloader tweaks. --- src/main/java/com/c2kernel/process/Bootstrap.java | 7 +++++-- src/main/java/com/c2kernel/process/module/ModuleResource.java | 4 +++- src/main/java/com/c2kernel/utils/CastorXMLUtility.java | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index d5fcaa0..1b9e027 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -67,6 +67,10 @@ public class Bootstrap public void run() { try { Thread.currentThread().setName("Bootstrapper"); + + ClassLoader wClassLoader = Bootstrap.class.getClassLoader(); + Logger.msg(String.format("Bootstrap.run() setContextClassLoader=[%s]",wClassLoader)); + Thread.currentThread().setContextClassLoader(wClassLoader); // make sure all of the boot items are up-to-date Logger.msg("Bootstrap.run() - Verifying kernel boot data items"); @@ -120,8 +124,7 @@ public class Bootstrap } } - public static DomainPath verifyResource(String ns, String itemName, Integer version, String itemType, ItemPath itemPath, String dataLocation, boolean reset) throws Exception { - if (version == null) version = 0; + public static DomainPath verifyResource(String ns, String itemName, int version, String itemType, ItemPath itemPath, String dataLocation, boolean reset) throws Exception { LookupManager lookupManager = Gateway.getLookupManager(); ResourceImportHandler typeImpHandler = getHandler(itemType); Logger.msg(1, "Bootstrap.verifyResource() - Verifying version "+version+" of "+typeImpHandler.getName()+" "+itemName); diff --git a/src/main/java/com/c2kernel/process/module/ModuleResource.java b/src/main/java/com/c2kernel/process/module/ModuleResource.java index 874c7cc..b482067 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleResource.java +++ b/src/main/java/com/c2kernel/process/module/ModuleResource.java @@ -10,11 +10,13 @@ import com.c2kernel.utils.Logger; public class ModuleResource extends ModuleImport { - public Integer version; + public int version; public String resourceType; public String resourceLocation; public ModuleResource() { + // if not given, version defaults to 0 + version = 0; } @Override diff --git a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java index c5c2499..497f934 100644 --- a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java +++ b/src/main/java/com/c2kernel/utils/CastorXMLUtility.java @@ -99,7 +99,7 @@ public class CastorXMLUtility mappingContext.setClassLoader(defaultClassLoader); // if the aAppProperties contains castor properties then - if (aAppProperties.contains(CASTOR_XML_SERIALIZER_FACTORY)) { + if (aAppProperties.containsKey(CASTOR_XML_SERIALIZER_FACTORY)) { mappingContext.setProperty(CASTOR_XML_SERIALIZER_FACTORY, aAppProperties -- cgit v1.2.3