Re: [Vysper] Error stanzas return too much of the original

[Niklas Gustavsson]

On Thu, Jul 9, 2009 at 11:48 PM, Niklas Gustavsson<nik...@protocol7.com> wrote:
> This also seems to agree with some examples from RFC 3920, for example here:
> http://xmpp.org/rfcs/rfc3920.html#bind

Here's a proposed patch for this:
Index: 
src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
===================================================================
--- 
src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java  
    (revision
791956)
+++ 
src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java  
    (working
copy)
@@ -104,7 +104,6 @@
         }

         StanzaBuilder responseBuilder =
StanzaBuilder.createDirectReply(stanza, true, "error");
-
         fillErrorStanza(stanza, type, errorCondition, errorText,
errorLang, errorConditionElement, responseBuilder);

         return responseBuilder.getFinalStanza();
@@ -112,7 +111,9 @@

     private void fillErrorStanza(XMPPCoreStanza stanza,
StanzaErrorType type, StanzaErrorCondition errorCondition, String
errorText, String errorLang, XMLElement errorConditionElement,
StanzaBuilder responseBuilder) {
         // inline incoming stanza as of RFC 3920 9.3.1
-        responseBuilder.addPreparedElement(stanza);
+        for(XMLElement innerElement : stanza.getInnerElements()) {
+            responseBuilder.addPreparedElement(innerElement);
+        }

         // error element
         responseBuilder.startInnerElement("error")


/niklas