You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2009/12/01 10:25:35 UTC
svn commit: r885698 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/protocol/
common/src/test/java/org/apache/shindig/common/crypto/
gadgets/src/main/java/org/apache/shindig/gadgets/parse/
gadgets/src/test/java/org/apache/sh...
Author: lindner
Date: Tue Dec 1 09:25:35 2009
New Revision: 885698
URL: http://svn.apache.org/viewvc?rev=885698&view=rev
Log:
SHINDIG-1237 | Patch from Jasvir Nagra | Patch addressing a couple of small errors
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=885698&r1=885697&r2=885698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java Tue Dec 1 09:25:35 2009
@@ -125,6 +125,7 @@
case -32601:
// Procedure doesn't exist
errorCode = HttpServletResponse.SC_NOT_IMPLEMENTED;
+ break;
case -32603:
default:
// Internal server error, or any application-defined error
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java?rev=885698&r1=885697&r2=885698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java Tue Dec 1 09:25:35 2009
@@ -120,8 +120,8 @@
fail("Blob should have expired");
} catch (BlobExpiredException e) {
assertEquals(start-skew, e.minDate.getTime());
- assertEquals(start+realAge*1000, e.used.getTime());
- assertEquals(start+skew+maxAge*1000, e.maxDate.getTime());
+ assertEquals(start+realAge*1000L, e.used.getTime());
+ assertEquals(start+skew+maxAge*1000L, e.maxDate.getTime());
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java?rev=885698&r1=885697&r2=885698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java Tue Dec 1 09:25:35 2009
@@ -116,7 +116,7 @@
NamedNodeMap attribs = elem.getAttributes();
for (int i = 0; i < attribs.getLength(); ++i) {
Attr attr = (Attr)attribs.item(i);
- if (!"type".equals(attr.getNodeName().equalsIgnoreCase("type"))) {
+ if (!attr.getNodeName().equalsIgnoreCase("type")) {
Attr newAttr = replacement.getOwnerDocument().createAttribute(attr.getNodeName());
newAttr.setValue(attr.getValue());
replacement.setAttributeNode(newAttr);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java?rev=885698&r1=885697&r2=885698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java Tue Dec 1 09:25:35 2009
@@ -45,7 +45,6 @@
IMocksControl control;
HttpCache cache;
DefaultInvalidationService service;
- Cache<String, Long> invalidationCache;
LruCacheProvider cacheProvider;
FakeGadgetToken appxToken;
FakeGadgetToken appyToken;