[Mulgara-svn] r1535 - trunk/src/jar/querylang/java/org/mulgara/protocol/http

[alexhall at mulgara.org]

Author: alexhall
Date: 2009-02-20 13:58:37 -0800 (Fri, 20 Feb 2009)
New Revision: 1535

Modified:
   trunk/src/jar/querylang/java/org/mulgara/protocol/http/ProtocolServlet.java
Log:
Ignore unknown output format parameter values.  Enum.valueOf() throws IllegalArgumentException for unknown enum identifiers instead of returning null.

Modified: trunk/src/jar/querylang/java/org/mulgara/protocol/http/ProtocolServlet.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/protocol/http/ProtocolServlet.java	2009-02-20 21:44:47 UTC (rev 1534)
+++ trunk/src/jar/querylang/java/org/mulgara/protocol/http/ProtocolServlet.java	2009-02-20 21:58:37 UTC (rev 1535)
@@ -693,8 +693,11 @@
     // check the URI parameters
     String reqOutputName = req.getParameter(OUTPUT_ARG);
     if (reqOutputName != null) {
-      Output reqOutput = Output.valueOf(reqOutputName.toUpperCase());
-      if (reqOutput != null) type = reqOutput;
+      try {
+        type = Output.valueOf(reqOutputName.toUpperCase());
+      } catch (IllegalArgumentException e) {
+        // no-op: ignore unknown enumeration values.
+      }
     }
 
     // need graph types if constructing a graph