geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428814 - in /geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src: ./ java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Date Fri, 04 Aug 2006 18:24:32 GMT
Author: jdillon
Date: Fri Aug  4 11:24:31 2006
New Revision: 428814

URL: http://svn.apache.org/viewvc?rev=428814&view=rev
Log:
 r626@jason-dillons-computer (orig r427995):  jdillon | 2006-08-02 07:14:22 -0700
  r611@dyn456093 (orig r427563):  jbohn | 2006-08-01 05:44:29 -0700
  GERONIMO-2218 fix bug in prior commit with delete processing
 

Modified:
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/   (props
changed)
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java

Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug  4 11:24:31 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:427991
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:427995

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=428814&r1=428813&r2=428814&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Fri Aug  4 11:24:31 2006
@@ -212,7 +212,7 @@
             for(int i = 0; i < keys.length; ++i) {
                 if(keys[i].equals(alias)) {
                     String[] temp = new String[keys.length-1];
-                    for(int j = 0; j < i-1; ++j) {
+                    for(int j = 0; j < i; ++j) {
                         temp[j] = keys[j];
                     }
                     for(int j = i+1; j < keys.length; ++j) {
@@ -226,13 +226,14 @@
             for(int i = 0; i < certificates.length; ++i) {
                 if(certificates[i].equals(alias)) {
                     String[] temp = new String[certificates.length-1];
-                    for(int j = 0; j < i-1; ++j) {
+                    for(int j = 0; j < i; ++j) {
                         temp[j] = certificates[j];
                     }
                     for(int j = i+1; j < certificates.length; ++j) {
                         temp[j-1] = certificates[j];
                     }
                     certificates = temp;
+                    break;
                 }
             }
             instance.deleteEntry(alias);



Mime
View raw message