You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2009/07/28 18:11:23 UTC
svn commit: r798593 - in
/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp:
modules/core/im/handler/PresenceSubscriptionHandler.java
xmldecoder/XMLRawToFragmentConverter.java
Author: berndf
Date: Tue Jul 28 16:11:23 2009
New Revision: 798593
URL: http://svn.apache.org/viewvc?rev=798593&view=rev
Log:
add placeholder for early stanza filtering/logging
disallow fall-through in switch case statements
Modified:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubscriptionHandler.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubscriptionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubscriptionHandler.java?rev=798593&r1=798592&r2=798593&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubscriptionHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubscriptionHandler.java Tue Jul 28 16:11:23 2009
@@ -137,18 +137,19 @@
// RFC3921bis-04#3.3.3
// contact unsubscribes
handleInboundUnsubscription(presenceStanza, serverRuntimeContext, sessionContext, registry, rosterManager);
+ return null;
case UNSUBSCRIBED:
// RFC3921bis-04#3.2.3
// contact denies subsription
handleInboundSubscriptionCancellation(presenceStanza, serverRuntimeContext, sessionContext, registry, rosterManager);
+ return null;
default:
throw new RuntimeException("unhandled case " + type.value());
}
}
-
return null;
}
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java?rev=798593&r1=798592&r2=798593&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java Tue Jul 28 16:11:23 2009
@@ -158,8 +158,11 @@
// but we do not support that.
throw new DecodingException("unsupported legal XML: colon at start of element name and no namespace specified");
}
- if (createStanza) return new Stanza(elementName, namespacePrefix, attributes, innerFragments);
- else return new XMLElement(elementName, namespacePrefix, attributes, innerFragments);
+ if (createStanza) {
+ Stanza stanza = new Stanza(elementName, namespacePrefix, attributes, innerFragments);
+ // place for filtering stanzas very early
+ return stanza;
+ } else return new XMLElement(elementName, namespacePrefix, attributes, innerFragments);
}
private List<Attribute> parseAttributes(String content) throws DecodingException {