Fix returning empty classpath if the provider doesnt have VIRTUAL_CLASSPATH

svn path=/projects/java-config-2/trunk/; revision=7075

1 files changed, 8 insertions, 10 deletions

diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py
index 04b609f..bf10e38 100644
--- a/src/java_config_2/Virtual.py
+++ b/src/java_config_2/Virtual.py
@@ -118,18 +118,16 @@ class Virtual(Package):
         """
         try:
             classpath=self.get_provider().virtual_classpath()
+            if None == classpath:
+                classpath=self.get_provider().classpath()
             return classpath
         except:
-            try:
-            	classpath=self.get_provider().classpath()
-                return classpath
-            except:
-                active_vm = self._manager.get_active_vm()
-                if active_vm and self.get_available_vms().count(active_vm.name()):
-                    if self._config.has_key("VM_CLASSPATH"):
-                        return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
-                else:
-                    raise ProviderUnavailableError( self._name, self.providing_vms, self.providing_packages )
+            active_vm = self._manager.get_active_vm()
+            if active_vm and self.get_available_vms().count(active_vm.name()):
+                if self._config.has_key("VM_CLASSPATH"):
+                    return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
+            else:
+                raise ProviderUnavailableError( self._name, self.providing_vms, self.providing_packages )
 
     def query(self, var):
         """