Author: dblevins
Date: Thu May 27 21:55:49 2010
New Revision: 949014
URL: http://svn.apache.org/viewvc?rev=949014&view=rev
Log:
set the default TimeUnit if one is not specified for the new AccessTimeout and
CloseTimeout attributes
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?rev=949014&r1=949013&r2=949014&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
Thu May 27 21:55:49 2010
@@ -395,9 +395,11 @@ public class StatelessInstanceManager {
String timeString = options.get("Timeout",
this.accessTimeout.toString());
timeString = options.get("AccessTimeout", timeString);
Duration accessTimeout = new Duration(timeString);
+ if (accessTimeout.getUnit() == null)
accessTimeout.setUnit(TimeUnit.MILLISECONDS);
String s = options.get("CloseTimeout", this.closeTimeout.toString());
Duration closeTimeout = new Duration(s);
+ if (closeTimeout.getUnit() == null)
closeTimeout.setUnit(TimeUnit.MILLISECONDS);
final ObjectRecipe recipe = PassthroughFactory.recipe(builder);
recipe.setAllProperties(deploymentInfo.getProperties());