|
@@ -123,7 +123,7 @@ class AsyncRequest(DirectObject):
|
|
|
self.cancelTimeOut()
|
|
self.cancelTimeOut()
|
|
|
self.timeoutTask=taskMgr.doMethodLater(
|
|
self.timeoutTask=taskMgr.doMethodLater(
|
|
|
self._timeoutTime, self._timeout, "AsyncRequestTimer-%s"%(id(self,)))
|
|
self._timeoutTime, self._timeout, "AsyncRequestTimer-%s"%(id(self,)))
|
|
|
- self._timeoutCount = TimeoutFailureCount
|
|
|
|
|
|
|
+ # self._timeoutCount = TimeoutFailureCount
|
|
|
|
|
|
|
|
def cancelTimeOut(self):
|
|
def cancelTimeOut(self):
|
|
|
if self.timeoutTask:
|
|
if self.timeoutTask:
|
|
@@ -193,6 +193,7 @@ class AsyncRequest(DirectObject):
|
|
|
self.acceptOnce(
|
|
self.acceptOnce(
|
|
|
"doFieldResponse-%s"%(context,),
|
|
"doFieldResponse-%s"%(context,),
|
|
|
self._checkCompletion, [key])
|
|
self._checkCompletion, [key])
|
|
|
|
|
+ # self.neededObjects[key] = None
|
|
|
self.air.queryObjectField(dclassName, fieldName, doId, context)
|
|
self.air.queryObjectField(dclassName, fieldName, doId, context)
|
|
|
self.startTimeOut()
|
|
self.startTimeOut()
|
|
|
|
|
|
|
@@ -214,6 +215,7 @@ class AsyncRequest(DirectObject):
|
|
|
self.acceptOnce(
|
|
self.acceptOnce(
|
|
|
"doRequestResponse-%s"%(context,),
|
|
"doRequestResponse-%s"%(context,),
|
|
|
self._checkCompletion, [None])
|
|
self._checkCompletion, [None])
|
|
|
|
|
+ # self.neededObjects[doId] = None
|
|
|
self.air.queryObjectAll(doId, context)
|
|
self.air.queryObjectAll(doId, context)
|
|
|
self.startTimeOut()
|
|
self.startTimeOut()
|
|
|
|
|
|
|
@@ -252,7 +254,7 @@ class AsyncRequest(DirectObject):
|
|
|
assert not self.__deleted
|
|
assert not self.__deleted
|
|
|
assert name
|
|
assert name
|
|
|
assert className
|
|
assert className
|
|
|
- self.neededObjects[name]=None
|
|
|
|
|
|
|
+ self.neededObjects[name] = None
|
|
|
if context is None:
|
|
if context is None:
|
|
|
context=self.air.allocateContext()
|
|
context=self.air.allocateContext()
|
|
|
self.accept(
|
|
self.accept(
|
|
@@ -286,7 +288,7 @@ class AsyncRequest(DirectObject):
|
|
|
assert not self.__deleted
|
|
assert not self.__deleted
|
|
|
assert name
|
|
assert name
|
|
|
assert className
|
|
assert className
|
|
|
- self.neededObjects[name]=None
|
|
|
|
|
|
|
+ self.neededObjects[name] = None
|
|
|
if context is None:
|
|
if context is None:
|
|
|
context=self.air.allocateContext()
|
|
context=self.air.allocateContext()
|
|
|
self.accept(
|
|
self.accept(
|