incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r417266 - in /incubator/lokahi/lokahi/trunk: conf/ApplicationResources.properties src/java/org/apache/lokahi/core/api/server/Hardware.java
Date Mon, 26 Jun 2006 18:17:51 GMT
Author: toback
Date: Mon Jun 26 11:17:51 2006
New Revision: 417266

URL: http://svn.apache.org/viewvc?rev=417266&view=rev
Log:
Fixed an errant sql exception on hardware delete.
added the human readable error for context name duplication.

Modified:
    incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java

Modified: incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties?rev=417266&r1=417265&r2=417266&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties (original)
+++ incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties Mon Jun 26 11:17:51
2006
@@ -133,7 +133,7 @@
 function.success.UpdateUser=The user has been updated.
 function.success.UpdateVirtualHost=The virtualhost has been updated.
 
-
+error.context.name.exists=Failed: The context name already exists on one or more of the tomcat
workers.
 error.user.alreadyExists=The user name {0} already exists.
 error.badFunction=An undefined function has been called.  Please contact an administrator.
 error.BadFunction=An undefined function has been called.  Please contact an administrator.

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java?rev=417266&r1=417265&r2=417266&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java
(original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java
Mon Jun 26 11:17:51 2006
@@ -335,7 +335,7 @@
     }
     if (c != null) {
       for (final Ip ip : c) {
-        broker.modifyRelationship("core.server.rel.ip.delete", this.getPk(), ip.getPk());
+        broker.delete("core.server.rel.ip.delete", this.getPk(), ip.getPk());
       }
       this.setIpAddresses(null);
       if (logger.isDebugEnabled()) {



Mime
View raw message