Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61D979A8B for ; Thu, 8 Dec 2011 05:08:30 +0000 (UTC) Received: (qmail 11278 invoked by uid 500); 8 Dec 2011 05:08:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 10973 invoked by uid 500); 8 Dec 2011 05:08:24 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 10957 invoked by uid 99); 8 Dec 2011 05:08:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2011 05:08:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2011 05:08:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CE01D23888E7; Thu, 8 Dec 2011 05:08:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211757 - /geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Date: Thu, 08 Dec 2011 05:08:01 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111208050801.CE01D23888E7@eris.apache.org> Author: xiaming Date: Thu Dec 8 05:08:01 2011 New Revision: 1211757 URL: http://svn.apache.org/viewvc?rev=1211757&view=rev Log: GERONIMO-6225 Ensure URI is valid before resolving a path string. And add logger to Module.java to log URI related exceptions as warnings Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=1211757&r1=1211756&r2=1211757&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Thu Dec 8 05:08:01 2011 @@ -17,6 +17,7 @@ package org.apache.geronimo.j2ee.deployment; import java.net.URI; +import java.net.URISyntaxException; import java.util.Comparator; import java.util.EnumSet; import java.util.HashMap; @@ -38,11 +39,14 @@ import org.apache.geronimo.kernel.config import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.kernel.repository.Environment; import org.apache.xbean.finder.AbstractFinder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Rev$ $Date$ */ public abstract class Module { + private static final Logger log = LoggerFactory.getLogger(Module.class); private final boolean standAlone; private final AbstractName moduleName; @@ -183,7 +187,21 @@ public abstract class Module { } public URI resolve(String path) { - return targetPathURI.resolve(path); + URI resultURI = null; + try { + resultURI = targetPathURI.resolve(path); + } catch (Exception e) { + log.warn("Exception=" + e + "; Cause=" + e.getCause()); + if (e instanceof java.lang.IllegalArgumentException) { + try { + URI substr = new URI(null, path, null); + resultURI = targetPathURI.resolve(substr); + } catch (Exception ex) { + throw new RuntimeException("Exception=" + ex + "; Cause=" + ex.getCause()); + } + } + } + return resultURI; } public URI resolve(URI path) {