Changeset 6364

Timestamp:

2004-01-08T15:58:46+13:00 (20 years ago)

Author:

kjdon

Message:

fixed a string == bug

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• collection/ServiceCluster.java (modified) (1 diff)
• core/MessageRouter.java (modified) (1 diff)
• service/ServiceRack.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -395 +395 @@
         Element param = (Element)params.item(i);
         // Identify the structure information desired
-        if (param.getAttribute(GSXML.NAME_ATT) == GSXML.SUBSET_PARAM ) {
+        if (param.getAttribute(GSXML.NAME_ATT).equals(GSXML.SUBSET_PARAM)) {
             String info = param.getAttribute(GSXML.VALUE_ATT);
             if (info.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -541 +541 @@
         Element param = (Element)params.item(i);
         // Identify the structure information desired
-        if (param.getAttribute(GSXML.NAME_ATT) == GSXML.SUBSET_PARAM ) {
+        if (param.getAttribute(GSXML.NAME_ATT).equals(GSXML.SUBSET_PARAM)) {
             String info = param.getAttribute(GSXML.VALUE_ATT);
             if (info.equals(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER)) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -249 +249 @@
         return response;
     } 
+    response.setAttribute(GSXML.FROM_ATT, to);
     Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     Element description = null;
@@ -259 +260 @@
         Element param = (Element)params.item(i);
         // Identify the structure information desired
-        if (param.getAttribute(GSXML.NAME_ATT) == GSXML.SUBSET_PARAM ) {
+        if (param.getAttribute(GSXML.NAME_ATT).equals(GSXML.SUBSET_PARAM )) {
             String info = param.getAttribute(GSXML.VALUE_ATT);
-
             if (description == null) {
              description = getServiceDescription(to, lang, info);
@@ -273 +273 @@
     if (description != null) { // may be null if non-existant service
         response.appendChild(description);
-        response.setAttribute(GSXML.FROM_ATT, to);
     }
     return response;