[jbosstools-commits] JBoss Tools SVN: r41811 - in trunk/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-06-08 08:55:01 -0400 (Fri, 08 Jun 2012)
New Revision: 41811

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java
Log:
[JBIDE-12138] added null-checks to avoid NPE's

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java	2012-06-08 12:51:41 UTC (rev 41810)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java	2012-06-08 12:55:01 UTC (rev 41811)
@@ -565,6 +565,10 @@
 
 	private static Collection<RemoteRefUpdate> getFailedUpdates(PushResult pushResult) {
 		List<RemoteRefUpdate> failedRefUpdates = new ArrayList<RemoteRefUpdate>();
+		if (pushResult == null
+				|| pushResult.getRemoteUpdates() == null) {
+			return failedRefUpdates;
+		}
 		for (RemoteRefUpdate update : pushResult.getRemoteUpdates()) {
 			if (org.eclipse.jgit.transport.RemoteRefUpdate.Status.OK
 				!= update.getStatus()) {

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java	2012-06-08 12:51:41 UTC (rev 41810)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java	2012-06-08 12:55:01 UTC (rev 41811)
@@ -131,6 +131,9 @@
 		Iterator<URIish> i = uris.iterator();
 		while(i.hasNext()) {
 			URIish uri = i.next();
+			if (pushOperationResult.getPushResult(uri) == null) {
+				continue;
+			}
 			for (RemoteRefUpdate update : pushOperationResult.getPushResult(uri).getRemoteUpdates()) {
 				result.append(getOneResultAsString(pushOperationResult, uri, update));
 			}