#181: when unknown fabric, now return 404

pongasoft · Dec 6, 2012 · c9144e5 · c9144e5
1 parent 9011117
commit c9144e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...ole-webapp/grails-app/conf/org.linkedin.glu.console.filters/UserPreferencesFilters.groovy b/...ole-webapp/grails-app/conf/org.linkedin.glu.console.filters/UserPreferencesFilters.groovy
@@ -91,7 +91,7 @@ class UserPreferencesFilters
     }
 
     // 2) last resort (when only 1 fabric, simply select it...)
-    if(!fabric)
+    if(!fabric && !request.isRestRequest)
     {
       def fabricNames = fabricService.listFabricNames()
       if(fabricNames.size() >= 1)

diff --git a/...-webapp/grails-app/controllers/org/linkedin/glu/console/controllers/ControllerBase.groovy b/...-webapp/grails-app/controllers/org/linkedin/glu/console/controllers/ControllerBase.groovy
@@ -22,6 +22,8 @@ import org.linkedin.util.codec.Base64Codec
 import org.linkedin.groovy.util.json.JsonUtils
 import org.linkedin.util.lang.LangUtils
 
+import javax.servlet.http.HttpServletResponse
+
 /**
  * Base class for controllers
  *
@@ -41,7 +43,10 @@ class ControllerBase
 
     if(!fabric)
     {
-      redirect(controller: 'fabric', action: 'select')
+      if(request.isRestRequest)
+        response.sendError(HttpServletResponse.SC_NOT_FOUND, "fabric")
+      else
+        redirect(controller: 'fabric', action: 'select')
       return false
     }