[jboss-svn-commits] JBL Code SVN: r19738 - labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2008-04-27 23:00:24 -0400 (Sun, 27 Apr 2008)
New Revision: 19738

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
Log:
JBRULES-1289 Tightening error reporting

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java	2008-04-28 02:01:45 UTC (rev 19737)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java	2008-04-28 03:00:24 UTC (rev 19738)
@@ -979,24 +979,41 @@
     @WebRemote
     @Restrict("#{identity.loggedIn}")
     public BuilderResult[] buildAsset(RuleAsset asset) throws SerializableException {
-        AssetItem item = repository.loadAssetByUUID( asset.uuid );
 
-        ContentHandler handler = ContentHandler.getHandler( item.getFormat() );//new AssetContentFormatHandler();
-        handler.storeAssetContent( asset, item );
+    	try {
 
+	        AssetItem item = repository.loadAssetByUUID( asset.uuid );
 
-        if (handler instanceof IValidating) {
-            return ((IValidating) handler).validateAsset( item );
-        } else {
+	        ContentHandler handler = ContentHandler.getHandler( item.getFormat() );//new AssetContentFormatHandler();
+	        handler.storeAssetContent( asset, item );
 
-            ContentPackageAssembler asm = new ContentPackageAssembler(item);
-            if (!asm.hasErrors()) {
-                return null;
-            } else {
-                return generateBuilderResults( asm );
-            }
-        }
 
+	        if (handler instanceof IValidating) {
+	            return ((IValidating) handler).validateAsset( item );
+	        } else {
+
+	            ContentPackageAssembler asm = new ContentPackageAssembler(item);
+	            if (!asm.hasErrors()) {
+	                return null;
+	            } else {
+	                return generateBuilderResults( asm );
+	            }
+	        }
+    	} catch (Exception e) {
+    		log.error(e);
+            BuilderResult[] result = new BuilderResult[1];
+
+            BuilderResult res = new BuilderResult();
+            res.assetName = asset.metaData.name;
+            res.assetFormat = asset.metaData.format;
+            res.message = "Unable to validate this asset. (Check log for detailed messages).";
+            res.uuid = asset.uuid;
+            result[0] = res;
+
+
+            return result;
+    	}
+
     }
 
     @WebRemote