ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r393317 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
Date Tue, 11 Apr 2006 21:50:49 GMT
Author: mbenson
Date: Tue Apr 11 14:50:46 2006
New Revision: 393317

URL: http://svn.apache.org/viewcvs?rev=393317&view=rev
Log:
apparently benign but untestable fix for PR 37766.

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewcvs/ant/core/trunk/WHATSNEW?rev=393317&r1=393316&r2=393317&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Apr 11 14:50:46 2006
@@ -195,7 +195,11 @@
 
 * <available> could leak resources, Bugzilla Report 38260.
 
-* redirector called Thread.sleep in a synchronized method. Bugzilla report 37767.
+* Redirector called Thread.sleep in a synchronized block. Bugzilla report 37767.
+
+* CCUnlock's objselect attribute could exhibit unpredictable behavior;
+  standardized improperly included objselect and objsel property accessors to
+  delegate to the inherited objSelect property accessor. Bugzilla report 37766.
 
 Other changes:
 --------------

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java?rev=393317&r1=393316&r2=393317&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
Tue Apr 11 14:50:46 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004, 2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
  * comment field doesn't include all options yet
  */
 
-
 /**
  * Performs a ClearCase Unlock command.
  *
@@ -70,7 +69,6 @@
 public class CCUnlock extends ClearCase {
     private String mComment = null;
     private String mPname = null;
-    private String mObjselect = null;
 
     /**
      * Executes the task.
@@ -115,20 +113,20 @@
     /**
      * Check the command line options.
      */
-private void checkOptions(Commandline cmd) {
+    private void checkOptions(Commandline cmd) {
         // ClearCase items
         getCommentCommand(cmd);
 
-        if (getObjselect() == null && getPname() == null) {
+        if (getObjSelect() == null && getPname() == null) {
             throw new BuildException("Should select either an element "
             + "(pname) or an object (objselect)");
         }
         getPnameCommand(cmd);
         // object selector
-        if (getObjselect() != null) {
-            cmd.createArgument().setValue(getObjselect());
+        if (getObjSelect() != null) {
+            cmd.createArgument().setValue(getObjSelect());
         }
-}
+    }
 
     /**
      * Sets how comments should be written
@@ -173,7 +171,7 @@
      * @param objselect objects to be locked
      */
     public void setObjselect(String objselect) {
-        mObjselect = objselect;
+        setObjSelect(objselect);
     }
 
     /**
@@ -183,7 +181,7 @@
      * @since ant 1.6.1
      */
     public void setObjSel(String objsel) {
-        mObjselect = objsel;
+        setObjSelect(objsel);
     }
 
     /**
@@ -192,10 +190,9 @@
      * @return String containing the objects to be locked
      */
     public String getObjselect() {
-        return mObjselect;
+        return getObjSelect();
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -246,7 +243,7 @@
         if (getPname() != null) {
             return getPname();
         } else {
-            return getObjselect();
+            return getObjSelect();
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message