merge in "Put <error/> child first on error" fixes

Denver Gingerich created 8 years ago

Some clients expect <error/> first and we should always set the type
to :error regardless.

See merge request !17 for the discussion and details behind the merge.

Change summary

sgx-catapult.rb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

Detailed changes

sgx-catapult.rb

@@ -135,10 +135,7 @@ module SGXcatapult
 	end
 
 	def self.error_msg(orig, query_node, type, name, text=nil)
-		if not query_node.nil?
-			orig.add_child(query_node)
-			orig.type = :error
-		end
+		orig.type = :error
 
 		error = Nokogiri::XML::Node.new 'error', orig.document
 		error['type'] = type
@@ -148,6 +145,8 @@ module SGXcatapult
 		suberr['xmlns'] = 'urn:ietf:params:xml:ns:xmpp-stanzas'
 		error.add_child(suberr)
 
+		orig.add_child(query_node) if query_node
+
 		# TODO: add some explanatory xml:lang='en' text (see text param)
 		puts "RESPONSE3: #{orig.inspect}"
 		return orig