aboutsummaryrefslogtreecommitdiffstats
path: root/dcevm
diff options
context:
space:
mode:
authorIvan Dubrov <idubrov@guidewire.com>2016-04-06 12:05:07 -0700
committerIvan Dubrov <idubrov@guidewire.com>2016-04-06 12:05:07 -0700
commitadc662028544e3413b61cf142679ffd8a7e588f2 (patch)
treefb730b21ae9375a87af55763da018c010e52ca1e /dcevm
parent43433a1c1daab40c6e498ebf0321ac96ddb330d2 (diff)
downloaddcevm-adc662028544e3413b61cf142679ffd8a7e588f2.tar.gz
dcevm-adc662028544e3413b61cf142679ffd8a7e588f2.zip
Fixing parsing for inner classes
Diffstat (limited to 'dcevm')
-rw-r--r--dcevm/src/main/java/com/github/dcevm/HotSwapTool.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/dcevm/src/main/java/com/github/dcevm/HotSwapTool.java b/dcevm/src/main/java/com/github/dcevm/HotSwapTool.java
index 391554a9..2fee0864 100644
--- a/dcevm/src/main/java/com/github/dcevm/HotSwapTool.java
+++ b/dcevm/src/main/java/com/github/dcevm/HotSwapTool.java
@@ -50,6 +50,7 @@ public class HotSwapTool {
* to make the IDE not complain about multiple defined classes.
*/
public static final Pattern VERSION_PATTERN = Pattern.compile("___([0-9]+)");
+ public static final Pattern VERSION_MATCH = Pattern.compile(".*(___([0-9]+))$");
private static final String CLASS_FILE_SUFFIX = ".class";
private static Map<Class<?>, Integer> currentVersion = new Hashtable<Class<?>, Integer>();
private static Redefiner redefiner;
@@ -216,13 +217,17 @@ public class HotSwapTool {
* Parse version of the class from the class name. Classes are named in the form of [Name]___[Version]
*/
private static int parseClassVersion(String simpleName) {
- Matcher m = VERSION_PATTERN.matcher(simpleName);
- return m.find() ? Integer.valueOf(m.group(1)) : 0;
+ Matcher m = VERSION_MATCH.matcher(simpleName);
+ return m.matches() ? Integer.valueOf(m.group(2)) : 0;
}
private static String stripVersion(String className) {
- Matcher m = VERSION_PATTERN.matcher(className);
- return m.replaceAll("");
+ Matcher m = VERSION_MATCH.matcher(className);
+ if (m.matches()) {
+ return className.substring(0, m.start(1)) + className.substring(m.end(1));
+ } else {
+ return className;
+ }
}
public static void resetTimings() {