Changeset 9265

Timestamp:

2005-03-03T16:23:19+13:00 (19 years ago)

Author:

kjdon

Message:

instead of returning null if something goes wrong, which then calls a NPE, now process returns a response with an error message inside it

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 diffs)

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

@@ -193 +193 @@
         // other type of request, must be processed by the subclass - 
         // send to the service method
-
+        StringBuffer error_string = new StringBuffer();
         String to = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));        
         Element response = null;
@@ -206 +206 @@
             try {
                 m = c.getDeclaredMethod(method_name, params);
-                // if this has worked, break
+                // if this has worked, break
                 break;
             } catch (NoSuchMethodException e) {
                 c = c.getSuperclass();
             } catch (SecurityException e) {
-                System.err.println("ServiceRack.process: security exception for finding method "+method_name+", returning null");
-                return null;
+                System.err.println("ServiceRack.process: security exception for finding method "+method_name);
+                error_string.append("ServiceRack.process: security exception for finding method "+method_name);
             }
             } // while
@@ -222 +222 @@
             } catch (Exception e) {
                 System.err.println("ServiceRack.process: Trying to call a processService type method (process"+to+") on a subclass("+this.getClass().getName()+"), but an exception happened:"+e.toString());
-                return null;
+                error_string.append("ServiceRack.process: Trying to call a processService type method (process"+to+") on a subclass("+this.getClass().getName()+"), but an exception happened:"+e.toString());
             }
             } else {
             System.err.println("ServiceRack.process: method "+method_name+" not found for class "+this.getClass().getName());
-            }
-            if (response !=null) {
-            mainResult.appendChild(this.doc.importNode(response, true));
+            error_string.append("ServiceRack.process: method "+method_name+" not found for class "+this.getClass().getName());
             }
             
         } catch (ClassNotFoundException e) {
             System.err.println("ServiceRack error: Element class not found");
-            return null;
+            error_string.append("ServiceRack error: Element class not found");
         }
-        }
+        if (response !=null) {
+            mainResult.appendChild(this.doc.importNode(response, true));
+        } else {
+            // add in a dummy response
+            System.err.println("adding in an error element\n");
+            response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+            GSXML.addError(this.doc, response, error_string.toString());
+            mainResult.appendChild(response);
+            
+        }
+ 
+        } // else process request
     } // for each request