[CVS spice] removed redundant invocation of m_namespace.getObjectInstance() in lookup() - already performed in localLookup()
tanderson-yCVjj/[email protected] 30 Jun 2005 04:18:18 -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/jndikit/src/java/org/codehaus/spice/jndikit</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">AbstractLocalContext.java</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-13</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
</table>
<pre class="comment">
removed redundant invocation of m_namespace.getObjectInstance() in lookup() - already performed in localLookup()
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/jndikit/src/java/org/codehaus/spice/jndikit<br /></span>
<div class="fileheader"><big><b>AbstractLocalContext.java</b></big> <small id="info">1.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- AbstractLocalContext.java 24 Jun 2005 15:04:43 -0000 1.2
+++ AbstractLocalContext.java 30 Jun 2005 04:18:18 -0000 1.3
@@ -18,7 +18,6 @@
</small></pre><pre class="diff" id="context"> import javax.naming.NamingException;
import javax.naming.NotContextException;
import javax.naming.OperationNotSupportedException;
</pre><pre class="diff" id="removed">-import javax.naming.Reference;
</pre><pre class="diff" id="context"> import javax.naming.Referenceable;
/**
</pre><pre class="diff"><small id="info">@@ -27,7 +26,7 @@
</small></pre><pre class="diff" id="context"> * on the same machine.
*
* @author Peter Donald
</pre><pre class="diff" id="removed">- * @version $Revision: 1.<span id="removedchars">2</span> $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.<span id="addedchars">3</span> $
</pre><pre class="diff" id="context"> */
public abstract class AbstractLocalContext
extends AbstractContext
</pre><pre class="diff"><small id="info">@@ -106,7 +105,6 @@
</small></pre><pre class="diff" id="context"> }
else
{
</pre><pre class="diff" id="removed">- //Should this occur here or in the factories ???
</pre><pre class="diff" id="context"> if( object instanceof Referenceable )
{
object = ( (Referenceable)object ).getReference();
</pre><pre class="diff"><small id="info">@@ -301,17 +299,8 @@
</small></pre><pre class="diff" id="context"> if( 1 == name.size() )
{
Object obj = localLookup( name );
</pre><pre class="diff" id="removed">- if( obj instanceof Reference )
</pre><pre class="diff" id="added">+ if (obj instanceof AbstractLocalContext)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- try
- {
- obj = m_namespace.getObjectInstance( obj, name, this, this.getEnvironment() );
- }
- catch( Exception e )
- {
- throw new NamingException( "Could not resolve reference" );
- }
- } else if (obj instanceof AbstractLocalContext) {
</pre><pre class="diff" id="context"> return ((AbstractLocalContext) obj).cloneContext();
}
</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>