You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2013/09/05 15:24:10 UTC

svn commit: r1520299 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java

Author: stefanegli
Date: Thu Sep  5 13:24:10 2013
New Revision: 1520299

URL: http://svn.apache.org/r1520299
Log:
SLING-3030 : avoid a npe

Modified:
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java?rev=1520299&r1=1520298&r2=1520299&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java Thu Sep  5 13:24:10 2013
@@ -123,7 +123,7 @@ public class ConvertToContentPackageActi
 						action.setEnabled(false);
 					} else {
 						Model mavenModel = MavenHelper.getMavenModel(project);
-						if ("content-package".equals(mavenModel.getPackaging())) {
+						if (mavenModel!=null && "content-package".equals(mavenModel.getPackaging())) {
 							action.setEnabled(true);
 						} else {
 							action.setEnabled(false);