diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-09-21 17:49:43 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-09-21 17:49:43 +0200 |
| commit | cfa70de9ec7745356ed00c1502d5bd55eee14181 (patch) | |
| tree | 03bfdd5c05d8303542bd7b4591016f825091b402 /src/main/java/com/c2kernel/process | |
| parent | 482b98e869d07802310e249d09d784c63f9a86b6 (diff) | |
Lost commits - NPE on ModuleResource.getVersion caused by bad
autoboxing, and Olivier's classloader tweaks.
Diffstat (limited to 'src/main/java/com/c2kernel/process')
| -rw-r--r-- | src/main/java/com/c2kernel/process/Bootstrap.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/ModuleResource.java | 4 |
2 files changed, 8 insertions, 3 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);
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
|