From f7df981d031e360b379b86d9aefdde15b918b21f Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 25 Aug 2014 13:53:33 +0200 Subject: Require integers for all resource versions --- src/main/java/com/c2kernel/utils/ActDefCache.java | 2 +- src/main/java/com/c2kernel/utils/LocalObjectLoader.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/utils') diff --git a/src/main/java/com/c2kernel/utils/ActDefCache.java b/src/main/java/com/c2kernel/utils/ActDefCache.java index 2ee5c7c..f5a7a78 100644 --- a/src/main/java/com/c2kernel/utils/ActDefCache.java +++ b/src/main/java/com/c2kernel/utils/ActDefCache.java @@ -18,7 +18,7 @@ public class ActDefCache { SoftCache actCache = new SoftCache(); - public ActivityDef get(String actName, String actVersion) throws ObjectNotFoundException, InvalidDataException { + public ActivityDef get(String actName, int actVersion) throws ObjectNotFoundException, InvalidDataException { ActivityDef thisActDef; synchronized(actCache) { ActCacheEntry thisActDefEntry = actCache.get(actName+"_"+actVersion); diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java index 63bb3c2..3025f2d 100644 --- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java +++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java @@ -22,7 +22,7 @@ public class LocalObjectLoader { return (ItemProxy)Gateway.getProxyManager().getProxy(defPath); } - static public String getScript(String scriptName, String scriptVersion) throws ObjectNotFoundException { + static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFoundException { Logger.msg(5, "Loading script "+scriptName+" v"+scriptVersion); try { ItemProxy script = loadLocalObjectDef("/desc/Script/", scriptName); @@ -65,7 +65,7 @@ public class LocalObjectLoader { * @return ActivityDef * @throws ObjectNotFoundException - When activity or version does not exist */ - static public ActivityDef getActDef(String actName, String actVersion) throws ObjectNotFoundException, InvalidDataException { + static public ActivityDef getActDef(String actName, int actVersion) throws ObjectNotFoundException, InvalidDataException { Logger.msg(5, "Loading activity def "+actName+" v"+actVersion); return actCache.get(actName, actVersion); } -- cgit v1.2.3