Author: antelder
Date: Tue May 12 07:16:21 2009
New Revision: 773807
URL: http://svn.apache.org/viewvc?rev=773807&view=rev
Log:
TUSCANY-3015: Fix scanner determination for when contribution file path
contains a space
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java?rev=773807&r1=773806&r2=773807&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
Tue May 12 07:16:21 2009
@@ -20,6 +20,7 @@
import java.io.File;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.List;
@@ -114,10 +115,14 @@
// Create a contribution scanner
ContributionScanner scanner =
scanners.getContributionScanner(contributionURL.getProtocol());
if (scanner == null) {
- if ("file".equals(contributionURL.getProtocol()) && new
File(contributionURL.getFile()).isDirectory()) {
- scanner = new DirectoryContributionScanner();
- } else {
- scanner = new JarContributionScanner();
+ try {
+ if ("file".equals(contributionURL.getProtocol()) && new
File(contributionURL.toURI()).isDirectory()) {
+ scanner = new DirectoryContributionScanner();
+ } else {
+ scanner = new JarContributionScanner();
+ }
+ } catch (URISyntaxException e) {
+ throw new ContributionReadException(e);
}
}