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

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

Author: Rikkola
Date: 2010-07-28 11:01:04 -0400 (Wed, 28 Jul 2010)
New Revision: 34259

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/VerificationServiceImplementation.java
Log:
[#GUVNOR-575] Verification fails due to a repository lock

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/VerificationServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/VerificationServiceImplementation.java	2010-07-28 14:47:40 UTC (rev 34258)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/VerificationServiceImplementation.java	2010-07-28 15:01:04 UTC (rev 34259)
@@ -42,8 +42,6 @@
 import org.drools.verifier.VerifierConfigurationImpl;
 import org.drools.verifier.builder.ScopesAgendaFilter;
 import org.drools.verifier.builder.VerifierBuilderFactory;
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.remoting.WebRemote;
 import org.jboss.seam.annotations.security.Restrict;
 import org.jboss.seam.contexts.Contexts;
@@ -57,8 +55,6 @@
  * @author rikkola
  *
  */
- at Name("org.drools.guvnor.client.rpc.VerificationService")
- at AutoCreate
 public class VerificationServiceImplementation extends RemoteServiceServlet
     implements
     VerificationService {
@@ -67,10 +63,12 @@
 
     private static final LoggingHelper log              = LoggingHelper.getLogger( ServiceImplementation.class );
 
-    private ServiceImplementation      service          = RepositoryServiceServlet.getService();
-
     private Verifier                   defaultVerifier  = VerifierBuilderFactory.newVerifierBuilder().newVerifier();
 
+    private ServiceImplementation getService() {
+        return RepositoryServiceServlet.getService();
+    }
+
     @WebRemote
     @Restrict("#{identity.loggedIn}")
     public AnalysisReport analysePackage(String packageUUID) throws SerializationException {
@@ -79,7 +77,7 @@
                                                  RoleTypes.PACKAGE_DEVELOPER );
         }
 
-        PackageItem packageItem = service.getRulesRepository().loadPackageByUUID( packageUUID );
+        PackageItem packageItem = getService().getRulesRepository().loadPackageByUUID( packageUUID );
 
         VerifierRunner runner = new VerifierRunner( defaultVerifier );
 
@@ -120,7 +118,7 @@
                                                  RoleTypes.PACKAGE_DEVELOPER );
         }
 
-        PackageItem packageItem = service.getRulesRepository().loadPackage( asset.metaData.packageName );
+        PackageItem packageItem = getService().getRulesRepository().loadPackage( asset.metaData.packageName );
 
         ScopesAgendaFilter verificationScope;
 
@@ -142,7 +140,7 @@
         } else {
             verifierToBeUsed = getWorkingSetVerifier( constraintRules );
         }
-        runner = new VerifierRunner(verifierToBeUsed);
+        runner = new VerifierRunner( verifierToBeUsed );
 
         log.debug( "constraints rules: " + constraintRules );
 
@@ -166,11 +164,11 @@
     }
 
     private List<String> applyWorkingSets(Set<String> activeWorkingSets) throws SerializationException {
-        if (activeWorkingSets == null){
+        if ( activeWorkingSets == null ) {
             return new LinkedList<String>();
         }
-        
-        RuleAsset[] workingSets = service.loadRuleAssets( activeWorkingSets.toArray(new String[activeWorkingSets.size()]) );
+
+        RuleAsset[] workingSets = getService().loadRuleAssets( activeWorkingSets.toArray( new String[activeWorkingSets.size()] ) );
         List<String> constraintRules = new LinkedList<String>();
         if ( workingSets != null ) {
             for ( RuleAsset workingSet : workingSets ) {