Changeset 1992

Timestamp:

Sep 3, 2011, 9:06:39 PM (12 years ago)

Author:

business@…

Message:

added exception handling for host resolving

File:

• trunk/grails-app/controllers/RestController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/RestController.groovy

@@ -426 +426 @@
                 // Create data for all assays
                 moduleURL = new URL(params.moduleURL)
-                moduleInet = InetAddress.getByName(moduleURL.getHost())
+                try {
+                        moduleInet = InetAddress.getByName(moduleURL.getHost())
+                }
+                catch(Exception e) {
+                        moduleInet = moduleURL.host
+                }
+
                 assays.each{ assay ->
                         /**
@@ -472 +478 @@
 
         def doesModuleMatch = { assay, moduleURL, moduleInet ->
-                // only resolve hosts if the urls do not match identically
-                def assayModuleURL = new URL(assay.module.url)
-                def assayModuleInet = InetAddress.getByName(assayModuleURL.getHost())
-
-                return (
-                        moduleInet.hostAddress == assayModuleInet.hostAddress &&
-                        (moduleURL.path.replaceAll(/[^a-zA-Z0-9]/, "") == assayModuleURL.path.replaceAll(/[^a-zA-Z0-9]/, ""))
-                )
+
+                try {
+
+                        // only resolve hosts if the urls do not match identically
+                        def assayModuleURL = new URL(assay.module.url)
+                        def assayModuleInet = InetAddress.getByName(assayModuleURL.getHost())
+
+                        return (
+                                moduleInet.hostAddress == assayModuleInet.hostAddress &&
+                                (moduleURL.path.replaceAll(/[^a-zA-Z0-9]/, "") == assayModuleURL.path.replaceAll(/[^a-zA-Z0-9]/, ""))
+                        )
+                }
+                catch (Exception e) {
+                        // If for some reason an error occurs (e.g. because the hostname is invalid and throws an UnknownHostException)
+                        // assume the calling module does not equal the assay module considered
+                        return false
+                }
         }