Changeset 3001 for SRUServer

Timestamp:

06/06/13 10:05:07 (11 years ago)

Author:

oschonef

Message:

• remove redundant null-checks (found by FindBugs?)

Location:

SRUServer/trunk/src/main/java/eu/clarin/sru/server

Files:

• SRURequestImpl.java (modified) (1 diff)
• SRUServer.java (modified) (1 diff)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRURequestImpl.java

@@ -301 +301 @@
                         break;
                     case RECORD_SCHEMA:
-                        if (value != null) {
+                        /*
+                         * The parameter recordSchema may contain either schema
+                         * identifier or the short name. If available, set to
+                         * appropriate schema identifier in the request object.
+                         */
+                        SRUServerConfig.SchemaInfo schemaInfo =
+                            config.findSchemaInfo(value);
+                        if (schemaInfo != null) {
+                            recordSchemaIdentifier = schemaInfo.getIdentifier();
+                        } else {
                             /*
-                             * The parameter recordSchema may contain either
-                             * schema identifier or the short name. If
-                             * available, set to appropriate schema identifier
-                             * in the request object.
+                             * SRU servers are supposed to raise a non-surrogate
+                             * (fatal) diagnostic in case the record schema is
+                             * not known to the server.
                              */
-                            SRUServerConfig.SchemaInfo schemaInfo =
-                                    config.findSchemaInfo(value);
-                            if (schemaInfo != null) {
-                                recordSchemaIdentifier =
-                                        schemaInfo.getIdentifier();
-                            } else {
-                                /*
-                                 * SRU servers are supposed to raise a
-                                 * non-surrogate (fatal) diagnostic in case the
-                                 * record schema is not known to the server.
-                                 */
-                                addDiagnostic(
-                                        SRUConstants.SRU_UNKNOWN_SCHEMA_FOR_RETRIEVAL,
-                                        value, "Record schema \"" + value +
-                                        "\" is not supported  for retrieval.");
-                            }
+                            addDiagnostic(
+                                    SRUConstants.SRU_UNKNOWN_SCHEMA_FOR_RETRIEVAL,
+                                    value, "Record schema \"" + value +
+                                    "\" is not supported  for retrieval.");
                         }
                         break;

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServer.java

@@ -353 +353 @@
             endResponse(out);
         } finally {
-            if (result != null) {
-                result.close();
-            }
+            result.close();
         }
     }