Author: dkulp Date: Thu Jan 3 22:52:27 2013 New Revision: 1428657 URL: http://svn.apache.org/viewvc?rev=1428657&view=rev Log: Merged revisions 1428545 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1428545 | dkulp | 2013-01-03 13:52:59 -0500 (Thu, 03 Jan 2013) | 10 lines Merged revisions 1428524 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1428524 | dkulp | 2013-01-03 13:14:12 -0500 (Thu, 03 Jan 2013) | 2 lines [CXF-4727] Add an npe guard ........ ........ Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java?rev=1428657&r1=1428656&r2=1428657&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java (original) +++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java Thu Jan 3 22:52:27 2013 @@ -72,7 +72,9 @@ public class ExtendedURIResolver { while (!resourceOpened.isEmpty()) { try { InputStream in = resourceOpened.pop(); - in.close(); + if (in != null) { + in.close(); + } } catch (IOException ioe) { // move on... }
