FCL/sf/app/jrt: comparison javacommons/gcfprotocols/http/src.s60/nativehttptraansaction.cpp

equal deleted inserted replaced

-:2a9601315dfc
+:98ccebc37403
 NativeHttpTransaction::NativeHttpTransaction(HttpSessionClient& aSession, FunctionServer* aFuncServer)
 :iSessionClient(aSession) //, java::util::FunctionServer("MyhttpServer2")
 {
-//  createServerToNewThread();
 iFuncServer = aFuncServer;
 }
 /**
 TInt NativeHttpTransaction::NewL(JNIEnv &aJni, jobject aPeer, HttpSessionClient& aSession,
 const TDesC* aUri, const TDesC* aRequestMethod,java::util::FunctionServer* aFuncServer)
 {
 NativeHttpTransaction* self =   new(ELeave) NativeHttpTransaction(aSession,aFuncServer);
-// Cleanup the event source object if a leave occurs during construction:
-//TConstructor selfCleanup(self, aJni);
 self->ConstructL(aJni, aPeer, /*aServer, */ aUri, aRequestMethod);
 // Pop the cleanup of the object and create a handle:
 return reinterpret_cast<int>(self); //selfCleanup.GetHandle();
 void NativeHttpTransaction::ConstructL(JNIEnv& aJni, jobject aPeer,/* TJavaEventServer aServer,*/
 const TDesC* aUri, const TDesC* aRequestMethod)
 {
-//  iJniPeer = aJni.NewWeakGlobalRef(aPeer);
 iJniPeer = aJni.NewWeakGlobalRef(aPeer);
-//  CJavaEventSourceBase::ConstructL(aJni, aPeer, aServer);
-//Set up the Java Call Backs                                           HttpConnectionNative
-/*
-jclass httpNativeClass = aJni.FindClass( "com/nokia/mj/impl/http/HttpConnectionNative" );
-if ( httpNativeClass == NULL )
-{
-User::Leave( KErrGeneral );
-}
-iTransactionCallbackMethod   = aJni.GetMethodID( httpNativeClass, "transactionSubmitCallback", "(I)V" );
-if ( iTransactionCallbackMethod  == NULL )
-{
-User::Leave( KErrGeneral );
-}
-iNotifyDataReadyForReadMethod = aJni.GetMethodID( httpNativeClass, "dataReadyForReadCallBack", "(I)V" );
-if ( iNotifyDataReadyForReadMethod == NULL )
-{
-User::Leave( KErrGeneral );
-}
-*/
 // iFuncServer->attachToVm(aJni, aPeer);
 int handle = reinterpret_cast<int>(this);
 int urihandle = reinterpret_cast<int>(aUri);
 int methodhandle = reinterpret_cast<int>(aRequestMethod);
 //open the transaction
-//User::LeaveIfError(ExecuteTrap(&NativeHttpTransaction::ExecuteCreateTransactionL, this , aUri , aRequestMethod));
 CallMethodL(this, &NativeHttpTransaction::ExecuteCreateTransactionL,handle,urihandle , methodhandle, iFuncServer);
-//ExecuteCreateTransactionL( this , aUri , aRequestMethod);
 }
 void NativeHttpTransaction::ExecuteCreateTransactionL(int aSelfhandle, int aUrihandle, int aMethodhandle)
 {
 NativeHttpTransaction* aSelf = reinterpret_cast<NativeHttpTransaction*>(aSelfhandle);
 //retrieve the headers
 RPointerArray<HBufC8> rawHeaderArray;
 CleanupStack::PushL(TCleanupItem(CleanUpResetAndDestroy,&rawHeaderArray));
 iJniObject = aJni;
-//iJniPeer = aPeer;
-//iFuncServer->attachToVm(*aJni, *aPeer);
 if (aHeaders!=NULL)
 {
 TInt count = aJni->GetArrayLength(aHeaders);
 if (count>KErrNone)
 {
 delete postBuf;
 postBuf = NULL;
 }
-//  ExecuteSubmitL( this, &rawHeaderArray , postBuf);
 CleanupStack::PopAndDestroy();//rawHeaderArray;
 }
 void NativeHttpTransaction::ExecuteSubmitL(int aSelfhandle , int aRawHeadershandle , int aPostBufhandle, int aResponseTimeout)
 {
-//RPointerArray<HBufC8>* aRawHeaders;
 NativeHttpTransaction *aSelf = reinterpret_cast<NativeHttpTransaction*>(aSelfhandle);
 RPointerArray<HBufC8>* aRawHeaders = reinterpret_cast<RPointerArray<HBufC8>*>(aRawHeadershandle);
 HBufC8* aPostBuf = reinterpret_cast<HBufC8*>(aPostBufhandle);
 aSelf->iTransactionClient->SubmitL(aRawHeaders, aPostBuf, aResponseTimeout);
 jobjectArray NativeHttpTransaction::GetResponseL(JNIEnv* aJni)
 {
 jobjectArray objArray=NULL;
 RPointerArray<HBufC8> rawHeaders(KResponseGranularity);
 CleanupStack::PushL(TCleanupItem(CleanUpResetAndDestroy,&rawHeaders));
-//User::LeaveIfError(ExecuteTrap(&NativeHttpTransaction::ExecuteGetResponseL, this, &rawHeaders));
 int handle = reinterpret_cast<int>(this);
 int arrayhandle = reinterpret_cast<int>(&rawHeaders);
 CallMethodL(this, &NativeHttpTransaction::ExecuteGetResponseL,handle,arrayhandle , iFuncServer);
-//ExecuteGetResponseL( this, &rawHeaders);
 const TInt headerCount = rawHeaders.Count();
 if (headerCount>KErrNone)
 {
 jclass stringClass = aJni->FindClass("java/lang/String");
 User::LeaveIfNull(stringClass);
 * or -1 if there is no more data because the end of the stream
 * has been reached.
 */
 TInt NativeHttpTransaction::ReadBytes(TUint8* aBytes, TInt aLength)
 {
-//return    Execute(&NativeHttpTransaction::ExecuteReadBytes, this, aBytes , aLength);
 int handle = reinterpret_cast<int>(this);
 int uinthandle = reinterpret_cast<int>(aBytes);
 int ret = 0;
 CallMethod(ret,this, &NativeHttpTransaction::ExecuteReadBytes,handle,uinthandle,aLength,iFuncServer);
 return ret;
-//return    ExecuteReadBytes( this, aBytes , aLength);
 }
 TInt NativeHttpTransaction::ExecuteReadBytes(int aSelfhandle, int aByteshandle, TInt aLength)
 {
 NativeHttpTransaction *aSelf = reinterpret_cast<NativeHttpTransaction*>(aSelfhandle);
 void NativeHttpTransaction::SubmitComplete(TInt aStatus)
 {
 LOG(ESOCKET,EInfo,"+NativeHttpTransaction::SubmitComplete");
-//     jclass httpNativeClass = NULL;
-//     httpNativeClass = iJniObject->FindClass("com/nokia/mj/impl/http/HttpConnectionNative");
-//     jmethodID iMethodID  = NULL;
-//     iMethodID = iJniObject->GetMethodID( httpNativeClass, "transactionSubmitCallback", "(I)V" );
-//     if ( httpNativeClass == NULL )
-//       {
-//          LOG(ESOCKET,EInfo,"+httpNativeClass is null");
-//       }
-//     if ( iMethodID == NULL )
-//       {
-//          LOG(ESOCKET,EInfo,"+iMethodID is NULL");
-//       }
-/*   if ( iJniPeer == NULL )
-{
-LOG(ESOCKET,EInfo,"+iJniPeer is null");
-}*/
 NativeHttpSession* session = reinterpret_cast<NativeHttpSession*>(iFuncServer);
 session->doSubmitCallback(aStatus,iJniPeer);
-// PostEvent(new (ELeave) CHttpTransactionEvent(iTransactionCallbackMethod, aStatus ),CJavaEventBase::ENotifyPriority);
 LOG(ESOCKET,EInfo,"-NativeHttpTransaction::SubmitComplete");
 }
 void NativeHttpTransaction::DataReadyForRead(TInt aStatus)
 {
 LOG(ESOCKET,EInfo,"+NativeHttpTransaction::DataReadyForRead");
-//       jclass httpNativeClass = NULL;
-//     httpNativeClass = iJniObject->FindClass("com/nokia/mj/impl/http/HttpConnectionNative");
-//     jmethodID iMethodReadCallBackID  = NULL;
-//     iMethodReadCallBackID = iJniObject->GetMethodID( httpNativeClass, "dataReadyForReadCallBack", "(I)V" );
-//
-//       iFuncServer->mJniEnv->CallVoidMethod(mJavaPeerObject,iMethodReadCallBackID,1);
 NativeHttpSession* session = reinterpret_cast<NativeHttpSession*>(iFuncServer);
 session->doReadCallback(aStatus,iJniPeer);
-//PostEvent(new (ELeave) CHttpTransactionEvent(iNotifyDataReadyForReadMethod, aStatus ),CJavaEventBase::ENotifyPriority);
 LOG(ESOCKET,EInfo,"-NativeHttpTransaction::DataReadyForRead");
 }
 void NativeHttpTransaction::ExecuteCloseTransaction(int aSelfhandle)
 {
 }
 void NativeHttpTransaction::Dispose()
 {
 LOG(ESOCKET,EInfo,"+NativeHttpTransaction::Dispose()");
-//iFuncServer->stopServer();
 CloseTransaction();
 delete iTransactionClient;
 iTransactionClient=NULL;
-//  iFuncServer->detachFromVm();
 LOG(ESOCKET,EInfo,"-NativeHttpTransaction::Dispose()");
 }
 void NativeHttpTransaction::CloseTransaction()
 {
-//ExecuteV(&NativeHttpTransaction::ExecuteCloseTransaction, this);
 int handle = reinterpret_cast<int>(this);
 CallMethod(this, &NativeHttpTransaction::ExecuteCloseTransaction,handle,iFuncServer);
-//ExecuteCloseTransaction( this);
 }
 OS_EXPORT TInt NativeHttpTransaction::GetSecurityInfo()

changeset 23	98ccebc37403
parent 21	2a9601315dfc
child 48	e0d6e9bd3ca7