Bug 275493 - NPE in the log

1 files changed, 4 insertions, 3 deletions

diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryStatusHelper.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryStatusHelper.java
index c5c2d5bb3..840e487b2 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryStatusHelper.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryStatusHelper.java
@@ -236,13 +236,13 @@ public abstract class RepositoryStatusHelper {
 			if (((IncomingFileTransferException) t).getErrorCode() == 401)
 				throw new AuthenticationFailedException();
 			IStatus status = ((IncomingFileTransferException) t).getStatus();
-			t = status.getException();
+			t = status == null ? t : status.getException();
 			// From Use of Browse
 		} else if (t instanceof BrowseFileTransferException) {
 			if (((BrowseFileTransferException) t).getErrorCode() == 401)
 				throw new AuthenticationFailedException();
 			IStatus status = ((BrowseFileTransferException) t).getStatus();
-			t = status.getException();
+			t = status == null ? t : status.getException();
 		}
 
 		if (t == null || !(t instanceof IOException))
@@ -279,7 +279,8 @@ public abstract class RepositoryStatusHelper {
 		if (t instanceof FileNotFoundException)
 			throw (FileNotFoundException) t;
 		if (t instanceof CoreException) {
-			Throwable e = ((CoreException) t).getStatus().getException();
+			IStatus status = ((CoreException) t).getStatus();
+			Throwable e = status == null ? null : status.getException();
 			if (e instanceof FileNotFoundException)
 				throw (FileNotFoundException) e;
 		}