Author: psharples
Date: Thu Mar 14 18:23:05 2013
New Revision: 1456594
URL: http://svn.apache.org/r1456594
Log:
Added extra check for when widget specified in import file doesn't actually
exist on the original server. (i.e. bad link)
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java?rev=1456594&r1=1456593&r2=1456594&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java
Thu Mar 14 18:23:05 2013
@@ -164,12 +164,14 @@ public class DefaultOmdlService implemen
if(!providerType.equals(null)){
try {
Widget resolvedWidget =
widgetResolverService.resolveAndDownloadWidgetMetadata(widgetReference.getWidgetLink(),
providerType);
- // Check again in case the OMDL id attribute is not
the same as the one found in the href attribute
-
if(widgetService.getWidgetByUrl(resolvedWidget.getUrl())==null){
- raveWidget =
widgetResolverService.addWidget(resolvedWidget);
- logger.info("Widget added to rave.
("+raveWidget.getUrl()+")");
- }else{
- logger.info("Widget was already added to rave.
("+resolvedWidget.getUrl()+")");
+ if(resolvedWidget!=null){
+ // Check again in case the OMDL id attribute is
not the same as the one found in the href attribute
+
if(widgetService.getWidgetByUrl(resolvedWidget.getUrl())==null){
+ raveWidget =
widgetResolverService.addWidget(resolvedWidget);
+ logger.info("Widget added to rave.
("+raveWidget.getUrl()+")");
+ }else{
+ logger.info("Widget was already added to rave.
("+resolvedWidget.getUrl()+")");
+ }
}
} catch (Exception e) {
logger.error("Problem installing widget: "+
e.getMessage());
