Lost commits - NPE on ModuleResource.getVersion caused by bad

autoboxing, and Olivier's classloader tweaks.

1 files changed, 5 insertions, 2 deletions

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);