User: lqd Date: 02/02/01 20:02:23 Modified: src/main/org/jboss/mq Connection.java SpyDestination.java SpyMessage.java SpyTopic.java SpyTopicSession.java Added: src/main/org/jboss/mq DurableSubscriptionID.java Removed: src/main/org/jboss/mq DurableSubcriptionID.java Log: Fix typo. this just ate 30mins of my time ... realizing a missing "s" in the class name ... argh! Revision Changes Path 1.16 +2 -2 jbossmq/src/main/org/jboss/mq/Connection.java Index: Connection.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/Connection.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Connection.java 2002/01/05 06:38:13 1.15 +++ Connection.java 2002/02/02 04:02:22 1.16 @@ -36,7 +36,7 @@ * * @author Norbert Lataille ([EMAIL PROTECTED]) * @author Hiram Chirino ([EMAIL PROTECTED]) - * @version $Revision: 1.15 $ + * @version $Revision: 1.16 $ * @created August 16, 2001 */ public class Connection implements java.io.Serializable, javax.jms.Connection @@ -1000,7 +1000,7 @@ //We could check this, though } - void unsubscribe(DurableSubcriptionID id) + void unsubscribe(DurableSubscriptionID id) throws JMSException { try 1.4 +2 -2 jbossmq/src/main/org/jboss/mq/SpyDestination.java Index: SpyDestination.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyDestination.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SpyDestination.java 2001/10/03 02:27:40 1.3 +++ SpyDestination.java 2002/02/02 04:02:22 1.4 @@ -18,7 +18,7 @@ * @author Hiram Chirino ([EMAIL PROTECTED]) * @author David Maplesden ([EMAIL PROTECTED]) * @created August 16, 2001 - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class SpyDestination implements Destination, Serializable { @@ -68,7 +68,7 @@ } else if ( dest instanceof SpyTopic ) { out.writeByte( SPY_TOPIC ); out.writeUTF( ( ( SpyTopic )dest ).getName() ); - DurableSubcriptionID id = ( ( SpyTopic )dest ).durableSubscriptionID; + DurableSubscriptionID id = ( ( SpyTopic )dest ).durableSubscriptionID; if ( id == null ) { out.writeByte( NULL ); } else { 1.13 +3 -3 jbossmq/src/main/org/jboss/mq/SpyMessage.java Index: SpyMessage.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyMessage.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SpyMessage.java 2002/02/02 03:54:19 1.12 +++ SpyMessage.java 2002/02/02 04:02:22 1.13 @@ -31,7 +31,7 @@ * @author Hiram Chirino ([EMAIL PROTECTED]) * @author David Maplesden ([EMAIL PROTECTED]) * - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ */ public class SpyMessage implements Serializable, Message, Comparable, Externalizable { @@ -70,7 +70,7 @@ //For noLocal to be able to tell if this was a locally produced message public String producerClientId; //For durable subscriptions - public DurableSubcriptionID durableSubscriberID = null; + public DurableSubscriptionID durableSubscriberID = null; //For ordering in the JMSServerQueue (set on the server side) public transient long messageId; } @@ -482,7 +482,7 @@ this.header.msgReadOnly = original.header.msgReadOnly; this.header.producerClientId = original.header.producerClientId; if (original.header.durableSubscriberID != null) - this.header.durableSubscriberID = new DurableSubcriptionID(original.header.durableSubscriberID.clientID, original.header.durableSubscriberID.subscriptionName); + this.header.durableSubscriberID = new DurableSubscriptionID(original.header.durableSubscriberID.clientID, original.header.durableSubscriberID.subscriptionName); } public boolean isOutdated() { 1.3 +5 -5 jbossmq/src/main/org/jboss/mq/SpyTopic.java Index: SpyTopic.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopic.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SpyTopic.java 2001/08/17 03:04:01 1.2 +++ SpyTopic.java 2002/02/02 04:02:22 1.3 @@ -21,11 +21,11 @@ * @author Hiram Chirino ([EMAIL PROTECTED]) * @author David Maplesden ([EMAIL PROTECTED]) * @created August 16, 2001 - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class SpyTopic extends SpyDestination implements java.io.Serializable, javax.jms.Topic, javax.naming.Referenceable { - protected DurableSubcriptionID durableSubscriptionID; + protected DurableSubscriptionID durableSubscriptionID; // Constructor --------------------------------------------------- //added cached toString string for efficiency @@ -39,12 +39,12 @@ // Constructor --------------------------------------------------- public SpyTopic( SpyTopic topic, String clientID, String subscriptionName ) { - this( topic, new DurableSubcriptionID( clientID, subscriptionName ) ); + this( topic, new DurableSubscriptionID( clientID, subscriptionName ) ); } // Constructor --------------------------------------------------- - public SpyTopic( SpyTopic topic, DurableSubcriptionID subid ) { + public SpyTopic( SpyTopic topic, DurableSubscriptionID subid ) { super( topic.getTopicName() ); if ( subid == null ) { toStringStr = "TOPIC." + name; @@ -74,7 +74,7 @@ "org.jboss.mq.referenceable.SpyDestinationObjectFactory", null ); } - public DurableSubcriptionID getDurableSubscriptionID() { + public DurableSubscriptionID getDurableSubscriptionID() { return durableSubscriptionID; } 1.4 +2 -2 jbossmq/src/main/org/jboss/mq/SpyTopicSession.java Index: SpyTopicSession.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopicSession.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SpyTopicSession.java 2001/08/21 23:16:17 1.3 +++ SpyTopicSession.java 2002/02/02 04:02:22 1.4 @@ -31,7 +31,7 @@ * @author Norbert Lataille ([EMAIL PROTECTED]) * @author Hiram Chirino ([EMAIL PROTECTED]) * @created August 16, 2001 - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class SpyTopicSession extends SpySession @@ -135,7 +135,7 @@ public void unsubscribe( String name ) throws JMSException { //Not yet implemented - DurableSubcriptionID id = new DurableSubcriptionID( connection.getClientID(), name ); + DurableSubscriptionID id = new DurableSubscriptionID( connection.getClientID(), name ); connection.unsubscribe( id ); } } 1.1 jbossmq/src/main/org/jboss/mq/DurableSubscriptionID.java Index: DurableSubscriptionID.java =================================================================== package org.jboss.mq; /* * JBossMQ, the OpenSource JMS implementation * * Distributable under LGPL license. * See terms of license at gnu.org. */ import java.io.Serializable; /** * @author Norbert Lataille ([EMAIL PROTECTED]) * @author Hiram Chirino ([EMAIL PROTECTED]) * @created August 16, 2001 * @version $Revision: 1.1 $ */ public class DurableSubscriptionID implements java.io.Serializable { String clientID; String subscriptionName; public DurableSubscriptionID( String id, String subName ) { clientID = id; subscriptionName = subName; } /** * Insert the method's description here. Creation date: (7/27/2001 12:40:57 * AM) * * @param newClientID java.lang.String */ public void setClientID( java.lang.String newClientID ) { clientID = newClientID; } /** * Insert the method's description here. Creation date: (7/27/2001 12:40:57 * AM) * * @param newSubscriptionName java.lang.String */ public void setSubscriptionName( java.lang.String newSubscriptionName ) { subscriptionName = newSubscriptionName; } /** * Insert the method's description here. Creation date: (7/27/2001 12:40:57 * AM) * * @return java.lang.String */ public java.lang.String getClientID() { return clientID; } /** * Insert the method's description here. Creation date: (7/27/2001 12:40:57 * AM) * * @return java.lang.String */ public java.lang.String getSubscriptionName() { return subscriptionName; } public boolean equals( Object obj ) { try { DurableSubscriptionID o = ( DurableSubscriptionID )obj; return o.clientID.equals( clientID ) && o.subscriptionName.equals( subscriptionName ); } catch ( Throwable e ) { return false; } } public int hashCode() { return Integer.MIN_VALUE + clientID.hashCode() + subscriptionName.hashCode(); } public String toString() { return clientID + "-" + subscriptionName; } }
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development