Skip to content

Commit

Permalink
Merge pull request #439 from tejones/teiiddes-2439-master
Browse files Browse the repository at this point in the history
teiiddes-2439-master
  • Loading branch information
blafond committed Mar 26, 2015
2 parents fcaabcf + 8fad154 commit 12bf1b5
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -681,14 +681,17 @@ private File getXmlFileFromRestUrl(IConnectionProfile profile) {
MessageDialog.openError(this.getShell(), getString("ioErrorTitle"), //$NON-NLS-1$
getString("ioErrorMessage") + ex.getMessage()); //$NON-NLS-1$
} catch (Exception ex) {
if( ex instanceof JSONException && ex.getMessage().contains("A JSONObject text must begin with") ) { //$NON-NLS-1$
if( ex instanceof JSONException ) { //$NON-NLS-1$

String message = getString("invalidRESTResponseTypeMessage", responseType); //$NON-NLS-1$
message+="\r\n"+ex.getLocalizedMessage();
MessageDialog.openError(this.getShell(),
getString("invalidRESTConnectionProfileTitle"), //$NON-NLS-1$
message); //$NON-NLS-1$
} else {
ex.printStackTrace();
MessageDialog.openError(this.getShell(),
getString("invalidRESTConnectionProfileTitle"), //$NON-NLS-1$
ex.getLocalizedMessage()); //$NON-NLS-1$
}
} finally {
try {
Expand Down

0 comments on commit 12bf1b5

Please sign in to comment.