Author: tyrell
Date: Tue Dec 11 00:31:32 2007
New Revision: 10901
Log:
Adding exception handling to prevent deleted mashups from appearing in the UI.
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/RegistryUtils.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/RegistryUtils.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/RegistryUtils.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/RegistryUtils.java
Tue Dec 11 00:31:32 2007
@@ -92,11 +92,11 @@
try {
userRoles =
secureRegistry.getUserManager().getRealm().getUserStoreReader()
.getUserRoles(secureRegistry.getUserID());
- } catch (UserManagerException e) {
+ } catch (UserManagerException e) {
return false;
}
- if(userRoles != null){
+ if (userRoles != null) {
for (int x = 0; x < userRoles.length; x++) {
if
(userRoles[x].equalsIgnoreCase(RegistryConstants.ADMIN_ROLE)) {
return true;
@@ -307,33 +307,40 @@
qResults.setResultCount(resultPaths.length);
for (int j = 0; j < resultPaths.length && j < maxResults; j++) {
- Resource resultArtifact = registry.get(resultPaths[j]);
- String[] values = resultPaths[j].split("\\/");
- String mashupName = values[values.length - 1];
-
- QueryResult queryResult = new QueryResult();
- queryResult.setName(mashupName);
- queryResult.setAuthor(resultArtifact.getAuthorUserName());
+ try {
+ Resource resultArtifact = registry.get(resultPaths[j]);
+ String[] values = resultPaths[j].split("\\/");
+ String mashupName = values[values.length - 1];
+
+ QueryResult queryResult = new QueryResult();
+ queryResult.setName(mashupName);
+ queryResult.setAuthor(resultArtifact.getAuthorUserName());
+
+ if (RegistryConstants.COMMENT_MEDIA_TYPE
+ .equals(resultArtifact.getMediaType())) {
+ qResults.setResultsType("comment");
+ queryResult.setResultType("comment");
+
queryResult.setPath(resultArtifact.getProperty("resourcePath"));
+ String commentText = (String)
resultArtifact.getContent();
+ queryResult.setContentString(commentText);
+
+ } else {
+ qResults.setResultsType("resource");
+ queryResult.setResultType("resource");
+ queryResult.setPath(resultArtifact.getPath());
+
queryResult.setDescription(resultArtifact.getDescription());
+ queryResult
+ .setRating(
+
registry.getRating(resultArtifact.getPath(), currentUser));
+ queryResult
+ .setAverageRating(
+
registry.getAverageRating(resultArtifact.getPath()));
+ }
- if
(RegistryConstants.COMMENT_MEDIA_TYPE.equals(resultArtifact.getMediaType())) {
- qResults.setResultsType("comment");
- queryResult.setResultType("comment");
-
queryResult.setPath(resultArtifact.getProperty("resourcePath"));
- String commentText = (String) resultArtifact.getContent();
- queryResult.setContentString(commentText);
-
- } else {
- qResults.setResultsType("resource");
- queryResult.setResultType("resource");
- queryResult.setPath(resultArtifact.getPath());
-
queryResult.setDescription(resultArtifact.getDescription());
- queryResult
-
.setRating(registry.getRating(resultArtifact.getPath(), currentUser));
- queryResult
-
.setAverageRating(registry.getAverageRating(resultArtifact.getPath()));
+ qResults.addResult(queryResult);
+ } catch (RegistryException e) {
+ e.printStackTrace();
}
-
- qResults.addResult(queryResult);
}
}
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
