[CVS spice] Fixed bug preventing initialization of JettySever with a configuration.

sjoberg-yCVjj/[email protected] 22 Sep 2005 12:03:00 -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">DefaultJettyContainer.java</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">1.3 -&gt; 1.4</td></tr>
</table>
<pre class="comment">
Fixed bug preventing initialization of JettySever with a configuration.
</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>DefaultJettyContainer.java</b></big> <small id="info">1.3 -&gt; 1.4</small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- DefaultJettyContainer.java	14 Aug 2005 19:52:25 -0000	1.3
+++ DefaultJettyContainer.java	22 Sep 2005 12:03:00 -0000	1.4
@@ -107,8 +107,12 @@
</small></pre><pre class="diff" id="context">      */
     public void initialize() throws Exception
     {
</pre><pre class="diff" id="removed">-        final Server jettyServer;
</pre><pre class="diff" id="context">         if( null != m_jettyServer )
</pre><pre class="diff" id="added">+        {
+            return;
+        }
+        final Server jettyServer;
+        if( null != m_jettyConfiguration )
</pre><pre class="diff" id="context">         {
             if( m_jettyConfiguration instanceof String )
             {
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -&gt; email">CVSspam</a> 0.2.8</small></center>
</body></html>