maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r770340 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command: add/ checkin/ edit/ remove/ tag/ unedit/ update/
Date Thu, 30 Apr 2009 17:34:28 GMT
Author: olamy
Date: Thu Apr 30 17:34:27 2009
New Revision: 770340

URL: http://svn.apache.org/viewvc?rev=770340&view=rev
Log:
[SCM-466]  Release prepare causing exit Code 141 in linux with clearcase
Submitted by Adrien Gracia

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
Thu Apr 30 17:34:27 2009
@@ -59,8 +59,11 @@
             logger.debug( line );
         }
         int beginIndex = line.indexOf( '"' );
-        String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex +
1 ) );
-        addedFiles.add( new ScmFile( fileName, ScmFileStatus.ADDED ) );
+        if ( beginIndex != -1 )
+        {
+            String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
+            addedFiles.add( new ScmFile( fileName, ScmFileStatus.ADDED ) );
+        }
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java
Thu Apr 30 17:34:27 2009
@@ -59,8 +59,11 @@
             logger.debug( line );
         }
         int beginIndex = line.indexOf( '"' );
-        String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex +
1 ) );
-        checkedInFiles.add( new ScmFile( fileName, ScmFileStatus.CHECKED_IN ) );
+        if ( beginIndex != -1 )
+        {
+            String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
+            checkedInFiles.add( new ScmFile( fileName, ScmFileStatus.CHECKED_IN ) );
+        }
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java
Thu Apr 30 17:34:27 2009
@@ -59,8 +59,11 @@
             logger.debug( line );
         }
         int beginIndex = line.indexOf( '"' );
-        String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex +
1 ) );
-        editFiles.add( new ScmFile( fileName, ScmFileStatus.UNKNOWN ) );
+        if ( beginIndex != -1 )
+        {
+            String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
+            editFiles.add( new ScmFile( fileName, ScmFileStatus.UNKNOWN ) );
+        }
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
Thu Apr 30 17:34:27 2009
@@ -59,8 +59,11 @@
             logger.debug( line );
         }
         int beginIndex = line.indexOf( '"' );
-        String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex +
1 ) );
-        removedFiles.add( new ScmFile( fileName, ScmFileStatus.DELETED ) );
+        if ( beginIndex != -1 )
+        {
+            String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
+            removedFiles.add( new ScmFile( fileName, ScmFileStatus.DELETED ) );
+        }
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
Thu Apr 30 17:34:27 2009
@@ -59,10 +59,19 @@
             logger.debug( line );
         }
         int beginIndexTag = line.indexOf( '"' );
-        int endIndexTag = line.indexOf( '"', beginIndexTag + 1 );
-        int beginIndex = line.indexOf( '"', endIndexTag + 1 );
-        String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex +
1 ) );
-        taggedFiles.add( new ScmFile( fileName, ScmFileStatus.TAGGED ) );
+        if ( beginIndexTag != -1 )
+        {
+            int endIndexTag = line.indexOf( '"', beginIndexTag + 1 );
+            if ( endIndexTag != -1 )
+            {
+                int beginIndex = line.indexOf( '"', endIndexTag + 1 );
+                if ( beginIndex != -1 )
+                {
+                    String fileName = line.substring( beginIndex + 1, line.indexOf( '"',
beginIndex + 1 ) );
+                    taggedFiles.add( new ScmFile( fileName, ScmFileStatus.TAGGED ) );
+                }
+            }
+        }
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
Thu Apr 30 17:34:27 2009
@@ -61,8 +61,11 @@
         if ( line.indexOf( "Checkout cancelled" ) > -1 )
         {
             int beginIndex = line.indexOf( '"' );
-            String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
-            unEditFiles.add( new ScmFile( fileName, ScmFileStatus.UNKNOWN ) );
+            if ( beginIndex != -1 )
+            {
+                String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
+                unEditFiles.add( new ScmFile( fileName, ScmFileStatus.UNKNOWN ) );
+            }
         }
     }
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java?rev=770340&r1=770339&r2=770340&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
Thu Apr 30 17:34:27 2009
@@ -62,8 +62,11 @@
         if ( line.indexOf( ClearCaseUtil.getLocalizedResource( "loading" ) ) > -1 )
         {
             int beginIndex = line.indexOf( '"' );
-            String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
-            updatedFiles.add( new ScmFile( fileName, ScmFileStatus.UPDATED ) );
+            if ( beginIndex != -1 )
+            {
+                String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex
+ 1 ) );
+                updatedFiles.add( new ScmFile( fileName, ScmFileStatus.UPDATED ) );
+            }
         }
     }
 



Mime
View raw message