Changeset 1151

Timestamp:

03/02/11 13:40:33 (13 years ago)

Author:

patdui

Message:

• added check for existing id and throwing proper error.

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -132 +132 @@
         }
         ComponentDescription desc = registry.getComponentDescription(componentId);
+        checkAndThrowDescription(desc, componentId);
         String fileName = desc.getName() + "." + rawType;
         if ("xml".equalsIgnoreCase(rawType)) {
@@ -352 +353 @@
         }
         ProfileDescription desc = registry.getProfileDescription(profileId);
+        checkAndThrowDescription(desc, profileId);
         String fileName = desc.getName() + "." + rawType;
 
@@ -371 +373 @@
         }
         return createDownloadResponse(result, fileName);
-
+    }
+
+    private void checkAndThrowDescription(AbstractDescription desc, String id) {
+        if (desc == null) {
+            throw new WebApplicationException(Response.serverError().entity("Incorrect id:" + id + "cannot handle request").build());
+        }
     }
 
@@ -448 +455 @@
                 CMDComponentSpec spec = validator.getCMDComponentSpec();
                 int returnCode = action.execute(desc, spec, response, registry);
-                //                if (update) {
-                //                    returnCode = registry.update(desc, spec);
-                //                } else {
-                //                    returnCode = registry.register(desc, spec);
-                //                }
                 if (returnCode == 0) {
                     response.setRegistered(true);