Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: ESC key causes error msg ......................................................................
webadmin: ESC key causes error msg In some cases pressing escape key causes an error with status code 0. we will ignore this staus code, in the client side. Signed-off-by: Gilad Chaplik <[email protected]> Change-Id: Id37f3ee8e1d788cefb0929c97f89ef9e0da26673 --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java 1 file changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/7735/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java index 5724388..2df683c 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java @@ -141,6 +141,9 @@ service.RunQuery(queryType, parameters, new AsyncCallback<VdcQueryReturnValue>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunQuery: " + caught, caught); //$NON-NLS-1$ FrontendQueryAsyncResult f = new FrontendQueryAsyncResult(queryType, parameters, null); getEventsHandler().runQueryFailed(null); @@ -182,6 +185,9 @@ service.RunQuery(queryType, parameters, new AsyncCallback<VdcQueryReturnValue>() { @Override public void onFailure(Throwable caught) { + if(ignoreFailure(caught)){ + return; + } logger.log(Level.SEVERE, "Failed to execute RunQuery: " + caught, caught); //$NON-NLS-1$ getEventsHandler().runQueryFailed(null); failureEventHandler(caught); @@ -243,6 +249,9 @@ service.RunPublicQuery(queryType, parameters, new AsyncCallback<VdcQueryReturnValue>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunPublicQuery: " + caught, caught); //$NON-NLS-1$ FrontendQueryAsyncResult f = new FrontendQueryAsyncResult(queryType, parameters, null); getEventsHandler().runQueryFailed(null); @@ -284,6 +293,9 @@ service.RunPublicQuery(queryType, parameters, new AsyncCallback<VdcQueryReturnValue>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunQuery: " + caught, caught); //$NON-NLS-1$ getEventsHandler().runQueryFailed(null); failureEventHandler(caught); @@ -353,6 +365,9 @@ service.RunMultipleQueries(queryTypeList, queryParamsList, new AsyncCallback<ArrayList<VdcQueryReturnValue>>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunPublicQuery: " + caught, caught); //$NON-NLS-1$ FrontendMultipleQueryAsyncResult f = new FrontendMultipleQueryAsyncResult(queryTypeList, queryParamsList, null); @@ -450,6 +465,9 @@ service.RunAction(actionType, parameters, new AsyncCallback<VdcReturnValueBase>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunAction: " + caught, caught); //$NON-NLS-1$ failureEventHandler(caught); FrontendActionAsyncResult f = new FrontendActionAsyncResult(actionType, parameters, null, state); @@ -473,6 +491,9 @@ service.RunAction(actionType, parameters, new AsyncCallback<VdcReturnValueBase>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunAction: " + caught, caught); //$NON-NLS-1$ failureEventHandler(caught); FrontendActionAsyncResult f = new FrontendActionAsyncResult(actionType, parameters, null); @@ -506,6 +527,9 @@ service.RunMultipleActions(actionType, parameters, isRunOnlyIfAllCanDoPass, new AsyncCallback<ArrayList<VdcReturnValueBase>>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunAction: " + caught, caught); //$NON-NLS-1$ failureEventHandler(caught); @@ -614,6 +638,9 @@ @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute RunQuery: " + caught, caught); //$NON-NLS-1$ getEventsHandler().runQueryFailed(null); failureEventHandler(caught); @@ -646,6 +673,9 @@ service.logOff(vdcUser, new AsyncCallback<VdcReturnValueBase>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute Logoff: " + caught, caught); //$NON-NLS-1$ callback.onFailure(caught); } @@ -672,6 +702,9 @@ @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute Logoff: " + caught, caught); //$NON-NLS-1$ getEventsHandler().runQueryFailed(null); failureEventHandler(caught); @@ -692,6 +725,9 @@ service.getLoggedInUser(new AsyncCallback<VdcUser>() { @Override public void onFailure(Throwable caught) { + if (ignoreFailure(caught)) { + return; + } logger.log(Level.SEVERE, "Failed to execute sync getIsUserLoggedIn: " + caught, caught); //$NON-NLS-1$ failureEventHandler(caught); callback.OnFailure(null); @@ -828,4 +864,13 @@ public static Event getQueryCompleteEvent() { return QueryCompleteEvent; } + + // ignore escape key + protected static boolean ignoreFailure(Throwable caught) { + if (caught instanceof StatusCodeException && ((StatusCodeException) + caught).getStatusCode() == 0) { + return true; + } + return false; + } } -- To view, visit http://gerrit.ovirt.org/7735 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id37f3ee8e1d788cefb0929c97f89ef9e0da26673 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
