geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r427995 - in /geronimo/sandbox/svkmerge/trunk: ./ applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Date Wed, 02 Aug 2006 14:14:23 GMT
Author: jdillon
Date: Wed Aug  2 07:14:22 2006
New Revision: 427995

URL: http://svn.apache.org/viewvc?rev=427995&view=rev
Log:
 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/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Aug  2 07:14:22 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427559
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427563

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=427995&r1=427994&r2=427995&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Wed Aug  2 07:14:22 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