Set hard-coded deadline to just under 1 year

ejona86 · ejona86 · commit 68efade3f558 · 2015-07-06T12:48:26.000-07:00
10 years exceeds the maximum for some systems at the moment. Change to 1
year to workaround such systems while they get changed. And since "have
the default be a large number instead of not present" is a temporary fix
anyway.
diff --git a/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java b/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java
@@ -55,7 +55,7 @@ public void testConfigureTimeout() {
     // Create a default stub
     TestServiceGrpc.TestServiceBlockingStub stub =
         TestServiceGrpc.newBlockingStub(new FakeChannel());
-    assertEquals(TimeUnit.DAYS.toMicros(10 * 365),
+    assertEquals(TimeUnit.DAYS.toMicros(364),
         stub.getServiceDescriptor().fullDuplexCall.getTimeout());
     // Reconfigure it
     stub = stub.configureNewStub()
@@ -65,7 +65,7 @@ public void testConfigureTimeout() {
     assertEquals(TimeUnit.SECONDS.toMicros(2),
         stub.getServiceDescriptor().fullDuplexCall.getTimeout());
     // Default config unchanged
-    assertEquals(TimeUnit.DAYS.toMicros(10 * 365),
+    assertEquals(TimeUnit.DAYS.toMicros(364),
         TestServiceGrpc.CONFIG.fullDuplexCall.getTimeout());
   }
 
diff --git a/stub/src/main/java/io/grpc/stub/ClientCalls.java b/stub/src/main/java/io/grpc/stub/ClientCalls.java
@@ -69,7 +69,7 @@ public static <RequestT, ResponseT> MethodDescriptor<RequestT, ResponseT> create
     // TODO(zhangkun83): if timeout is not defined in proto file, use a default timeout here.
     // If timeout is defined in proto file, Method should carry the timeout.
     return MethodDescriptor.create(method.getType(), fullServiceName + "/" + method.getName(),
-        10 * 365, TimeUnit.DAYS, method.getRequestMarshaller(), method.getResponseMarshaller());
+        364, TimeUnit.DAYS, method.getRequestMarshaller(), method.getResponseMarshaller());
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static <RequestT, ResponseT> MethodDescriptor<RequestT, ResponseT> create`
`69`	`69`	`// TODO(zhangkun83): if timeout is not defined in proto file, use a default timeout here.`
`70`	`70`	`// If timeout is defined in proto file, Method should carry the timeout.`
`71`	`71`	`return MethodDescriptor.create(method.getType(), fullServiceName + "/" + method.getName(),`
`72`		`- 10 * 365, TimeUnit.DAYS, method.getRequestMarshaller(), method.getResponseMarshaller());`
	`72`	`+ 364, TimeUnit.DAYS, method.getRequestMarshaller(), method.getResponseMarshaller());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`