You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/05/07 12:33:11 UTC
svn commit: r1592961 - in
/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal:
SlingBundleModuleFactory.java SlingContentModuleFactory.java
Author: rombert
Date: Wed May 7 10:33:11 2014
New Revision: 1592961
URL: http://svn.apache.org/r1592961
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
Guard against ProjectFacetsManager.create returning null.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java?rev=1592961&r1=1592960&r2=1592961&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java Wed May 7 10:33:11 2014
@@ -67,6 +67,9 @@ public class SlingBundleModuleFactory ex
try {
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ if (facetedProject == null) {
+ return null;
+ }
for (IProjectFacetVersion facet : facetedProject.getProjectFacets()) {
if (facet.getProjectFacet().getId().equals(SLING_BUNDLE_FACET_ID)) {
return createModule(project.getName(), project.getName(), SLING_BUNDLE_FACET_ID, "1.0", project);
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java?rev=1592961&r1=1592960&r2=1592961&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java Wed May 7 10:33:11 2014
@@ -49,6 +49,9 @@ public class SlingContentModuleFactory e
try {
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ if (facetedProject == null) {
+ return null;
+ }
for (IProjectFacetVersion facet : facetedProject.getProjectFacets()) {
if (facet.getProjectFacet().getId().equals(SLING_CONTENT_FACET_ID)) {
return createModule(project.getName(), project.getName(), SLING_CONTENT_FACET_ID, "1.0", project);