@@ -172,7 +172,7 @@ public XPathException(final XQueryAST ast, final ErrorCode errorCode, final Stri
172
172
@ Deprecated
173
173
public XPathException (final Throwable cause ) {
174
174
super (cause );
175
- if ( cause instanceof XPathErrorProvider ) {
175
+ if ( cause != null && cause instanceof XPathErrorProvider ) {
176
176
this .errorCode = ((XPathErrorProvider )cause ).getErrorCode ();
177
177
}
178
178
}
@@ -190,7 +190,7 @@ public XPathException(final String message, final Throwable cause) {
190
190
public XPathException (final Expression expr , final String message , final Throwable cause ) {
191
191
super (cause );
192
192
this .message = message ;
193
- if ( cause instanceof XPathErrorProvider ) {
193
+ if ( cause != null && cause instanceof XPathErrorProvider ) {
194
194
this .errorCode = ((XPathErrorProvider )cause ).getErrorCode ();
195
195
}
196
196
@@ -208,7 +208,7 @@ public XPathException(final Expression expr, final String message, final Throwab
208
208
*/
209
209
@ Deprecated
210
210
public XPathException (final Expression expr , final Throwable cause ) {
211
- this (expr , cause instanceof XPathErrorProvider ? ((XPathErrorProvider )cause ).getErrorCode () : ErrorCodes .ERROR , cause .getMessage (), null , cause );
211
+ this (expr , cause != null && cause instanceof XPathErrorProvider ? ((XPathErrorProvider )cause ).getErrorCode () : ErrorCodes .ERROR , cause .getMessage (), null , cause );
212
212
}
213
213
214
214
/**
@@ -222,7 +222,9 @@ public XPathException(final ErrorCode errorCode, final String errorDesc) {
222
222
this .errorCode = errorCode ;
223
223
224
224
if (errorDesc == null ){
225
- this .message = errorCode .toString ();
225
+ if (errorCode != null ) {
226
+ this .message = errorCode .toString ();
227
+ }
226
228
} else {
227
229
this .message = errorDesc ;
228
230
}
@@ -238,7 +240,9 @@ public XPathException(final ErrorCode errorCode, final String errorDesc, final T
238
240
this .errorCode = errorCode ;
239
241
240
242
if (errorDesc == null ){
241
- this .message = errorCode .toString ();
243
+ if (errorCode != null ) {
244
+ this .message = errorCode .toString ();
245
+ }
242
246
} else {
243
247
this .message = errorDesc ;
244
248
}
@@ -254,7 +258,9 @@ public XPathException(final Expression expr, final ErrorCode errorCode, final St
254
258
this .errorCode = errorCode ;
255
259
256
260
if (errorDesc == null ){
257
- this .message = errorCode .toString ();
261
+ if (errorCode != null ) {
262
+ this .message = errorCode .toString ();
263
+ }
258
264
} else {
259
265
this .message = errorDesc ;
260
266
}
@@ -279,7 +285,7 @@ protected XPathException(final int line, final int column, final String message,
279
285
this .message = message ;
280
286
this .line = line ;
281
287
this .column = column ;
282
- if ( cause instanceof XPathErrorProvider ) {
288
+ if ( cause != null && cause instanceof XPathErrorProvider ) {
283
289
this .errorCode = ((XPathErrorProvider )cause ).getErrorCode ();
284
290
}
285
291
}
0 commit comments