Author: mwringe
Date: 2012-01-23 15:36:44 -0500 (Mon, 23 Jan 2012)
New Revision: 8306
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
Log:
JBEPP-1393: update class to the latest from GateIn to fix an issue with applications
appearing twice in the application registry on import all applications.
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2012-01-23
10:06:39 UTC (rev 8305)
+++
epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2012-01-23
20:36:44 UTC (rev 8306)
@@ -524,11 +524,25 @@
contentId = info.getApplicationName() + "/" +
info.getName();
}
- //
- app = category.createContent(portletName, contentType, contentId);
- app.setDisplayName(displayName);
- app.setDescription(getLocalizedStringValue(descriptionLS, portletName));
- app.setAccessPermissions(permissions);
+ // Check if the portlet has already existed in this category
+ List<Application> applications = load(category).getApplications();
+ boolean isExist = false;
+ for (Application application : applications)
+ {
+ if (application.getContentId().equals(contentId))
+ {
+ isExist = true;
+ break;
+ }
+ }
+
+ if (!isExist)
+ {
+ app = category.createContent(portletName, contentType, contentId);
+ app.setDisplayName(displayName);
+ app.setDescription(getLocalizedStringValue(descriptionLS,
portletName));
+ app.setAccessPermissions(permissions);
+ }
}
}
}