[CVS spice] Fixed bug preventing Servlet Filters from working. This change breaks Jetty 4 compatibility, though.
sjoberg-yCVjj/[email protected] 5 Sep 2005 16:53:31 -0000
| Newsgroups | gmane.comp.java.spice.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>spice/components/jervlet/src/java/org/codehaus/spice/jervlet/containers/jetty</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">JettyWebApplicationHandler.java</a></tt></td><td align="right" id="added">+7</td><td align="right" id="removed">-15</td><td nowrap="nowrap" align="center">1.1 -> 1.2</td></tr>
</table>
<pre class="comment">
Fixed bug preventing Servlet Filters from working. This change breaks Jetty 4 compatibility, though.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/jervlet/src/java/org/codehaus/spice/jervlet/containers/jetty<br /></span>
<div class="fileheader"><big><b>JettyWebApplicationHandler.java</b></big> <small id="info">1.1 -> 1.2</small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- JettyWebApplicationHandler.java 5 Jul 2005 13:32:12 -0000 1.1
+++ JettyWebApplicationHandler.java 5 Sep 2005 16:53:31 -0000 1.2
@@ -106,13 +106,14 @@
</small></pre><pre class="diff" id="context"> {
if( _nameMap.containsKey( name ) )
{
</pre><pre class="diff" id="removed">- throw new IllegalArgumentException( "Name already exists: " + name );
</pre><pre class="diff" id="added">+ throw new IllegalArgumentException( "Servletname ["
+ + name + "] exists already." );
</pre><pre class="diff" id="context"> }
else
{
ServletHolder holder = new JettyServletHolder(
m_instantiator, this, name, servletClassName, forcedPath );
</pre><pre class="diff" id="removed">- _nameMap.put( holder.getName(), holder );
</pre><pre class="diff" id="added">+ addServletHolder( holder );
</pre><pre class="diff" id="context"> return holder;
}
}
</pre><pre class="diff"><small id="info">@@ -126,22 +127,13 @@
</small></pre><pre class="diff" id="context"> *
* @param name Name of the servlet
* @param filterClassName Class name, e.g.
</pre><pre class="diff" id="removed">- * com.biz.project.impl.My<span id="removedchars">Servlet</span>
</pre><pre class="diff" id="added">+ * com.biz.project.impl.My<span id="addedchars">Filter</span>
</pre><pre class="diff" id="context"> * @return A new FilterHolder creating the Filter with a given
* Instantiator
*/
</pre><pre class="diff" id="removed">- public FilterHolder newFilterHolder( String name,<span id="removedchars"> String filterClassName )</span>
</pre><pre class="diff" id="added">+ public FilterHolder newFilterHolder( String name,
+ String filterClassName )
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- if( _nameMap.containsKey( name ) )
- {
- throw new IllegalArgumentException( "Name already exists: " + name );
- }
- else
- {
- FilterHolder holder = new JettyFilterHolder(
- m_instantiator, this, name, filterClassName );
- _nameMap.put( holder.getName(), holder );
- return holder;
- }
</pre><pre class="diff" id="added">+ return new JettyFilterHolder( m_instantiator, this, name, filterClassName );
</pre><pre class="diff" id="context"> }
}
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.8</small></center>
</body></html>