You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ho...@apache.org on 2006/12/14 07:54:55 UTC
svn commit: r487020 -
/geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Author: hogstrom
Date: Wed Dec 13 22:54:54 2006
New Revision: 487020
URL: http://svn.apache.org/viewvc?view=rev&rev=487020
Log:
Applying r486567 from trunk (2.0-SNAPSHOT)
Modified:
geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Modified: geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=487020&r1=487019&r2=487020
==============================================================================
--- geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Wed Dec 13 22:54:54 2006
@@ -700,7 +700,7 @@
}
UrlPatternType[] urlPatterns = servletMappingType.getUrlPatternArray();
for (int j = 0; j < urlPatterns.length; j++) {
- String urlPattern = urlPatterns[j].getStringValue();
+ String urlPattern = urlPatterns[j].getStringValue()i.trim();
if (!knownServletMappings.contains(urlPattern)) {
knownServletMappings.add(urlPattern);
checkString(urlPattern);
Re: svn commit: r487020 - /geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Posted by Vamsavardhana Reddy <c1...@gmail.com>.
Fixed in r487099.
On 12/14/06, Vamsavardhana Reddy <c1...@gmail.com> wrote:
>
> On 12/14/06, hogstrom@apache.org <ho...@apache.org> wrote:
> >
> > Author: hogstrom
> > Date: Wed Dec 13 22:54:54 2006
> > New Revision: 487020
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=487020
> > Log:
> > Applying r486567 from trunk ( 2.0-SNAPSHOT)
> >
> > Modified:
> >
> > geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> >
> > Modified:
> > geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> >
> > URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=487020&r1=487019&r2=487020
> >
> >
> > ==============================================================================
> > ---
> > geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> > (original)
> > +++
> > geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> > Wed Dec 13 22:54:54 2006
> > @@ -700,7 +700,7 @@
> > }
> > UrlPatternType[] urlPatterns =
> > servletMappingType.getUrlPatternArray();
> > for (int j = 0; j < urlPatterns.length; j++) {
> > - String urlPattern = urlPatterns[j].getStringValue();
> > + String urlPattern =
> > urlPatterns[j].getStringValue()i.trim();
>
>
> Won't the above line result in compilation error?
>
> if (!knownServletMappings.contains(urlPattern)) {
> > knownServletMappings.add(urlPattern);
> > checkString(urlPattern);
> >
> >
> >
>
Re: svn commit: r487020 - /geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Posted by Vamsavardhana Reddy <c1...@gmail.com>.
On 12/14/06, hogstrom@apache.org <ho...@apache.org> wrote:
>
> Author: hogstrom
> Date: Wed Dec 13 22:54:54 2006
> New Revision: 487020
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=487020
> Log:
> Applying r486567 from trunk (2.0-SNAPSHOT)
>
> Modified:
>
> geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
>
> Modified:
> geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=487020&r1=487019&r2=487020
>
> ==============================================================================
> ---
> geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> (original)
> +++
> geronimo/server/branches/2.0-M1/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
> Wed Dec 13 22:54:54 2006
> @@ -700,7 +700,7 @@
> }
> UrlPatternType[] urlPatterns =
> servletMappingType.getUrlPatternArray();
> for (int j = 0; j < urlPatterns.length; j++) {
> - String urlPattern = urlPatterns[j].getStringValue();
> + String urlPattern =
> urlPatterns[j].getStringValue()i.trim();
Won't the above line result in compilation error?
if (!knownServletMappings.contains(urlPattern)) {
> knownServletMappings.add(urlPattern);
> checkString(urlPattern);
>
>
>