activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1210788 - /activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDTO.java
Date Tue, 06 Dec 2011 05:36:49 GMT
Author: chirino
Date: Tue Dec  6 05:36:49 2011
New Revision: 1210788

URL: http://svn.apache.org/viewvc?rev=1210788&view=rev
Log:
Fixes APLO-85: Invalid apollo.xsd

Modified:
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDTO.java

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDTO.java?rev=1210788&r1=1210787&r2=1210788&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDTO.java
Tue Dec  6 05:36:49 2011
@@ -30,7 +30,7 @@ import java.util.List;
 public class DurableSubscriptionDTO extends QueueDTO {
 
     /**
-     *  A regular expression used to match the subsciption id.
+     *  A regular expression used to match the subscription id.
      */
     @XmlAttribute(name="id_regex")
     public String id_regex;
@@ -49,12 +49,6 @@ public class DurableSubscriptionDTO exte
     @XmlAttribute
     public String selector;
 
-    /**
-     * To hold any other non-matching XML elements
-     */
-    @XmlAnyElement(lax=true)
-    public List<Object> other = new ArrayList<Object>();
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -64,7 +58,6 @@ public class DurableSubscriptionDTO exte
         DurableSubscriptionDTO that = (DurableSubscriptionDTO) o;
 
         if (id_regex != null ? !id_regex.equals(that.id_regex) : that.id_regex != null) return
false;
-        if (other != null ? !other.equals(that.other) : that.other != null) return false;
         if (selector != null ? !selector.equals(that.selector) : that.selector != null) return
false;
         if (topic != null ? !topic.equals(that.topic) : that.topic != null) return false;
 
@@ -77,7 +70,6 @@ public class DurableSubscriptionDTO exte
         result = 31 * result + (id_regex != null ? id_regex.hashCode() : 0);
         result = 31 * result + (topic != null ? topic.hashCode() : 0);
         result = 31 * result + (selector != null ? selector.hashCode() : 0);
-        result = 31 * result + (other != null ? other.hashCode() : 0);
         return result;
     }
 }



Mime
View raw message