[jbosstools-commits] JBoss Tools SVN: r41810 - in branches/jbosstools-3.3.x/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console and 1 other directory.
Author: adietish
Date: 2012-06-08 08:51:41 -0400 (Fri, 08 Jun 2012)
New Revision: 41810
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
branches/jbosstools-3.3.x/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:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
===================================================================
---
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-06-08
11:48:36 UTC (rev 41809)
+++
branches/jbosstools-3.3.x/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)
@@ -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:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java
===================================================================
---
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java 2012-06-08
11:48:36 UTC (rev 41809)
+++
branches/jbosstools-3.3.x/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)
@@ -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));
}