Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-05-19 09:54:55 -0400
committerChristopher Frost2011-05-19 09:54:55 -0400
commit7eb75d59aab76907fc2eb9326349ce864cbff693 (patch)
tree023beb4babe58eee3710ceec70390d5166cf6d1b
parenteacd0b68f14a6073cc8a06d3e9372ebdd051a10e (diff)
downloadorg.eclipse.virgo.kernel-7eb75d59aab76907fc2eb9326349ce864cbff693.tar.gz
org.eclipse.virgo.kernel-7eb75d59aab76907fc2eb9326349ce864cbff693.tar.xz
org.eclipse.virgo.kernel-7eb75d59aab76907fc2eb9326349ce864cbff693.zip
The canonical form of a directory ends with a / and war files are sometimes handled as directories in Virgo but must be indexed in the ram as a file
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj1
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java5
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
index 0300dec6..d1290bce 100644
--- a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
+++ b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
@@ -61,6 +61,7 @@ public final aspect NonNullAssertionEnforcer {
Assert.notNull(argValue, "Argument [2] cannot be null");
}
+ @SuppressAjWarnings({"adviceDidNotMatch"})
before(Object argValue) : executingOperationWithNonNullThirdParameter(argValue) {
Assert.notNull(argValue, "Argument [3] cannot be null");
}
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java
index 4703a648..5b95a5a1 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java
@@ -207,10 +207,9 @@ final class StandardRuntimeArtifactModel implements RuntimeArtifactModel {
if (SCHEME_FILE.equals(uri.getScheme())) {
File file = new File(uri);
try {
- return file.getCanonicalFile().toURI();
+ return new URI(file.getCanonicalPath());
} catch (IOException e) {
-
- return uri;
+ return new URI(file.getAbsolutePath());
}
} else {
return uri;

Back to the top