svn commit: r965133 - in /mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124: BoshEndpoint.java BoshServlet.java

[ngn]

Author: ngn
Date: Sat Jul 17 21:01:07 2010
New Revision: 965133

URL: http://svn.apache.org/viewvc?rev=965133&view=rev
Log:
Make Flash cross domain policy file optional

Modified:
    
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshEndpoint.java
    
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshServlet.java

Modified: 
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshEndpoint.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshEndpoint.java?rev=965133&r1=965132&r2=965133&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshEndpoint.java
 (original)
+++ 
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshEndpoint.java
 Sat Jul 17 21:01:07 2010
@@ -133,7 +133,10 @@ public class BoshEndpoint implements End
 
         BoshServlet boshServlet = new BoshServlet();
         boshServlet.setServerRuntimeContext(serverRuntimeContext);
-        boshServlet.setFlashCrossDomainPolicy(flashCrossDomainPolicy);
+        
+        if(flashCrossDomainPolicy != null) {
+            boshServlet.setFlashCrossDomainPolicy(flashCrossDomainPolicy);
+        }
         context.addServlet(new ServletHolder(boshServlet), "/");
 
         try {

Modified: 
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshServlet.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshServlet.java?rev=965133&r1=965132&r2=965133&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshServlet.java
 (original)
+++ 
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshServlet.java
 Sat Jul 17 21:01:07 2010
@@ -99,7 +99,7 @@ public class BoshServlet extends HttpSer
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) 
throws ServletException, IOException {
         resp.addDateHeader("Date", System.currentTimeMillis());
         resp.addHeader("Server", SERVER_IDENTIFICATION);
-        if (FLASH_CROSS_DOMAIN_POLICY_URI.equals(req.getRequestURI())) {
+        if (FLASH_CROSS_DOMAIN_POLICY_URI.equals(req.getRequestURI()) && 
flashCrossDomainPolicy != null) {
             resp.setContentType(XML_CONTENT_TYPE);
             resp.setContentLength(flashCrossDomainPolicy.length);
             resp.getOutputStream().write(flashCrossDomainPolicy);