Changeset 15787 for greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

Timestamp:

2008-05-29T13:29:54+12:00 (16 years ago)

Author:

oranfry

Message:

updating from trunk: brought in trunk changes from r15191 to r15785

File:

• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (2 diffs)

greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -64 +64 @@
   public static final String DISPLAY_ELEM = "display";
   public static final String LEVEL_ELEM = "level";
+  public static final String DATABASE_TYPE_ELEM = "databaseType";
   public static final String SHORTNAME_ATT = "shortname";
   public static final String NOTIFY_ELEM = "notify";
   public static final String NOTIFY_HOST_ATT = "host";
-  
   // elems for the pages to be processed by xslt
   public final static String PAGE_ELEM = "page";
@@ -423 +423 @@
   /** returns the (first) child element with the given name */
   public static Node getChildByTagName(Node n, String name) {
-    
-    Node child = n.getFirstChild();
-    while (child!=null) {
-      if (child.getNodeName().equals(name)) {
-        return child;
-      }
-      child = child.getNextSibling();
-    }
-    return null; //not found
+      if(n != null) { // this line is an attempted solution to the NullPointerException mentioned 
+      // in trac bug ticket #225. If n is null can't do n.getFirstChild() below. As per bug #225: 
+      // GSXML.getNodeByPath() is called by GS2BrowseAction, which then calls this method.
+      // If n is null, null will be returned which GS2BrowseAction already checks for. It's here
+      // that the NullPointerException was thrown.
+ 
+      Node child = n.getFirstChild();
+      while (child!=null) {
+          if (child.getNodeName().equals(name)) {
+          return child;
+          }
+          child = child.getNextSibling();
+      }
+      }
+      return null; //not found
   }