geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r372311 - in /geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console: databasemanager/wizard/ jmsmanager/wizard/ repository/ securitymanager/realm/
Date Wed, 25 Jan 2006 20:51:24 GMT
Author: ammulder
Date: Wed Jan 25 12:51:20 2006
New Revision: 372311

URL: http://svn.apache.org/viewcvs?rev=372311&view=rev
Log:
Don't die if the repository produces a null URI (as it does if the file has
  no version number in the name) GERONIMO-1467
Also makeImportStatus$PoolProgress Serializable (separate issue, same JIRA)

Modified:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=372311&r1=372310&r2=372311&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Wed Jan 25 12:51:20 2006
@@ -748,6 +748,9 @@
                 final URI[] uris = repo.listURIs();
                 outer:
                 for (int j = 0; j < uris.length; j++) {
+                    if(uris[j] == null) {
+                        continue; // probably a JAR lacks a version number in the name, etc.
+                    }
                     String test = uris[j].toString();
                     for (int k = 0; k < SKIP_ENTRIES_WITH.length; k++) {
                         String skip = SKIP_ENTRIES_WITH[k];

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java?rev=372311&r1=372310&r2=372311&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
Wed Jan 25 12:51:20 2006
@@ -131,7 +131,7 @@
         return count;
     }
 
-    public final static class PoolProgress {
+    public final static class PoolProgress implements Serializable {
         public final static String TYPE_NOTX = "NoTX";
         public final static String TYPE_LOCAL = "JDBC";
         public final static String TYPE_XA = "XA";

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java?rev=372311&r1=372310&r2=372311&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
Wed Jan 25 12:51:20 2006
@@ -70,8 +70,11 @@
                 final URI[] uris = repo.listURIs();
                 outer:
                 for (int j = 0; j < uris.length; j++) {
+                    if(uris[j] == null) {
+                        continue; // probably a JAR lacks a version number in the name, etc.
+                    }
                     String test = uris[j].toString();
-                    if(!test.endsWith("/rar")) {
+                    if(!test.endsWith("/rar")) { //todo: may need to change this logic if
configId format changes
                         continue;
                     }
                     for (int k = 0; k < SKIP_RARS_CONTAINING.length; k++) {

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java?rev=372311&r1=372310&r2=372311&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
Wed Jan 25 12:51:20 2006
@@ -191,6 +191,9 @@
                 try {
                     final URI[] uris = repo.listURIs();
                     for (int j = 0; j < uris.length; j++) {
+                        if(uris[j] == null) {
+                            continue; // probably a JAR lacks a version number in the name,
etc.
+                        }
                         String fileName = uris[j].toString();
                         list.add(fileName);
                     }

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=372311&r1=372310&r2=372311&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
Wed Jan 25 12:51:20 2006
@@ -607,6 +607,9 @@
                 final URI[] uris = repo.listURIs();
                 outer:
                 for (int j = 0; j < uris.length; j++) {
+                    if(uris[j] == null) {
+                        continue; // probably a JAR lacks a version number in the name, etc.
+                    }
                     String test = uris[j].toString();
                     for (int k = 0; k < SKIP_ENTRIES_WITH.length; k++) {
                         String skip = SKIP_ENTRIES_WITH[k];



Mime
View raw message