[Hyperic-hq-discuss] hq r3720 - trunk/src/org/hyperic/hq/ui/action/portlet/autoDisc

[<cl...@hy...>]

Author: clee
Date: 2007-03-12 16:25:37 -0800 (Mon, 12 Mar 2007)
New Revision: 3720
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3720

Modified:
   trunk/src/org/hyperic/hq/ui/action/portlet/autoDisc/ViewAction.java
Log:
[HQ-568]
AIQApprovalException is the nested exception now and cannot be caught.
Doesn't matter though, there's only one place that sets the import error.

Modified: trunk/src/org/hyperic/hq/ui/action/portlet/autoDisc/ViewAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/portlet/autoDisc/ViewAction.java	2007-03-13 00:22:47 UTC (rev 3719)
+++ trunk/src/org/hyperic/hq/ui/action/portlet/autoDisc/ViewAction.java	2007-03-13 00:25:37 UTC (rev 3720)
@@ -140,12 +140,10 @@
         if (exc != null) {
             request.getSession().removeAttribute(Constants.IMPORT_ERROR_ATTR);
             log.error("Failed to approve AI report", exc);
-            if (exc instanceof AIQApprovalException) {
-                ActionMessage err =
-                    new ActionMessage("dash.autoDiscovery.import.Error",
-                                      exc.getMessage());
-                RequestUtils.setError(request, err, ActionMessages.GLOBAL_MESSAGE);
-            }
+            ActionMessage err =
+                new ActionMessage("dash.autoDiscovery.import.Error",
+                                  exc.getMessage());
+            RequestUtils.setError(request, err, ActionMessages.GLOBAL_MESSAGE);
         }
         return null;
     }