remm 00/11/02 23:30:59
Modified: catalina/src/share/org/apache/naming EjbRefAddr.java
ResourceEnvRefAddr.java ResourceRefAddr.java
Log:
- RefAddr.toString() actually does getContent().toString(), so overriding
getContent() and returning "this" is not a good idea ;)
Revision Changes Path
1.2 +4 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRefAddr.java
Index: EjbRefAddr.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRefAddr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EjbRefAddr.java 2000/11/02 06:14:16 1.1
+++ EjbRefAddr.java 2000/11/03 07:30:57 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRefAddr.java,v
1.1 2000/11/02 06:14:16 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/02 06:14:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRefAddr.java,v
1.2 2000/11/03 07:30:57 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/03 07:30:57 $
*
* ====================================================================
*
@@ -70,7 +70,7 @@
* Represents a reference address to an EJB.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2000/11/02 06:14:16 $
+ * @version $Revision: 1.2 $ $Date: 2000/11/03 07:30:57 $
*/
public class EjbRefAddr
@@ -149,7 +149,7 @@
* Returns the contents of the address.
*/
public Object getContent() {
- return this;
+ return this.home;
}
1.2 +4 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceEnvRefAddr.java
Index: ResourceEnvRefAddr.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceEnvRefAddr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceEnvRefAddr.java 2000/11/02 06:14:16 1.1
+++ ResourceEnvRefAddr.java 2000/11/03 07:30:57 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceEnvRefAddr.java,v
1.1 2000/11/02 06:14:16 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/02 06:14:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceEnvRefAddr.java,v
1.2 2000/11/03 07:30:57 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/03 07:30:57 $
*
* ====================================================================
*
@@ -70,7 +70,7 @@
* Represents a reference address to a resource environment.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2000/11/02 06:14:16 $
+ * @version $Revision: 1.2 $ $Date: 2000/11/03 07:30:57 $
*/
public class ResourceEnvRefAddr
@@ -116,7 +116,7 @@
* Returns the contents of the address.
*/
public Object getContent() {
- return this;
+ return this.resourceType;
}
1.2 +4 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceRefAddr.java
Index: ResourceRefAddr.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceRefAddr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceRefAddr.java 2000/11/02 06:14:16 1.1
+++ ResourceRefAddr.java 2000/11/03 07:30:58 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceRefAddr.java,v
1.1 2000/11/02 06:14:16 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/02 06:14:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ResourceRefAddr.java,v
1.2 2000/11/03 07:30:58 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/03 07:30:58 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Represents a reference address to a resource.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2000/11/02 06:14:16 $
+ * @version $Revision: 1.2 $ $Date: 2000/11/03 07:30:58 $
*/
public class ResourceRefAddr
@@ -141,7 +141,7 @@
* Returns the contents of the address.
*/
public Object getContent() {
- return this;
+ return this.resourceClass;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
