rpms/tog-pegasus/devel pegasus-2.5.1-obz4934.patch,NONE,1.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 14 23:40:16 UTC 2006


Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13170

Added Files:
	pegasus-2.5.1-obz4934.patch 
Log Message:
fix upstream bugzillas 4934(4943) and 4945; fix PATH_MAX and MAXHOSTNAMELEN issues;

pegasus-2.5.1-obz4934.patch:
 ProviderManager2/ProviderManagerService.cpp |   23 +++++++++--------------
 Server/CIMOperationRequestDispatcher.cpp    |    1 +
 2 files changed, 10 insertions(+), 14 deletions(-)

--- NEW FILE pegasus-2.5.1-obz4934.patch ---
--- pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp.obz4934	2006-02-28 14:53:30.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp	2006-04-14 17:47:30.000000000 -0400
@@ -567,8 +567,8 @@
     CIMRequestMessage* request,
     CIMResponseMessage* response)
 {
-	CIMStatusCode code = CIM_ERR_SUCCESS;
-	String message;
+    PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,
+        "ProviderManagerService::responseChunkCallback");
 
 	try
 	{
@@ -601,25 +601,20 @@
 		
 		op->_async_callback(op, service, op->_callback_ptr);
 	}
-
-	catch(CIMException &e)
-	{
-		code = e.getCode();
-		message = e.getMessage();
-	}
 	catch(Exception &e)
 	{
-		code = CIM_ERR_FAILED;
-		message = e.getMessage();
+        PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
+            "Exception in ProviderManagerService::responseChunkCallback: " +
+                e.getMessage() + ".  Chunk not delivered.");
 	}
 	catch(...)
 	{
-		code = CIM_ERR_FAILED;
-		message = cimStatusCodeToString(code);
+        PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
+            "Exception in ProviderManagerService::responseChunkCallback.  "
+                "Chunk not delivered.");
 	}
 
-	if (code !=  CIM_ERR_SUCCESS)
-		response->cimException = PEGASUS_CIM_EXCEPTION(code, message);
+    PEG_METHOD_EXIT();
 }
 
 Message* ProviderManagerService::_processMessage(CIMRequestMessage* request)
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz4934	2006-03-14 17:12:21.000000000 -0500
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp	2006-04-14 17:24:06.000000000 -0400
@@ -1770,6 +1770,7 @@
     {
         // put back the async request because there are more chunks to come.
         op->put_request(asyncRequest);
+        delete asyncReply;
     }
     else
     {




More information about the fedora-cvs-commits mailing list