svn commit: r890435 - /ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java

[midon]

Author: midon
Date: Mon Dec 14 18:50:12 2009
New Revision: 890435

URL: http://svn.apache.org/viewvc?rev=890435&view=rev
Log:
ODE-700: adjust name parsing

Modified:
    
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=890435&r1=890434&r2=890435&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
 Mon Dec 14 18:50:12 2009
@@ -71,8 +71,6 @@
 
     private final CopyOnWriteArrayList<ProcessStoreListener> _listeners = new 
CopyOnWriteArrayList<ProcessStoreListener>();
 
-     private static final String VERSION_REGEXP = "([-\\Q.\\E](\\d)+)?";
-
     private Map<QName, ProcessConfImpl> _processes = new HashMap<QName, 
ProcessConfImpl>();
 
     private Map<String, DeploymentUnitDir> _deploymentUnits = new 
HashMap<String, DeploymentUnitDir>();
@@ -328,7 +326,9 @@
     private void retirePreviousPackageVersions(DeploymentUnitDir du) {
         //retire all the other versions of the same DU
         String[] nameParts = du.getName().split("/");
-        nameParts[0] += VERSION_REGEXP;
+           /* Replace the version number (if any) with regexp to match any 
version number */
+            nameParts[0] = nameParts[0].replaceAll("([-\\Q.\\E](\\d)+)?\\z", 
"");
+            nameParts[0] += "([-\\Q.\\E](\\d)+)?";
         StringBuilder duNameRegExp = new StringBuilder(du.getName().length() * 
2);
         for (int i = 0, n = nameParts.length; i < n; i++) {
             if (i > 0) duNameRegExp.append("/");