--- a/javaextensions/bluetooth/omjbluetooth/src.s60/discoveryagent.cpp	Fri Sep 17 08:28:21 2010 +0300
+++ b/javaextensions/bluetooth/omjbluetooth/src.s60/discoveryagent.cpp	Mon Oct 04 00:10:53 2010 +0300
@@ -178,7 +178,7 @@
                 devAddr = java::util::JniUtils::wstringToJstring(aJni,
                           *(aDiscoveredDevice.mDeviceAddr));
             }
-            catch (ExceptionBase ex)
+            catch (ExceptionBase &ex)
             {
                 // Nothing to handle
             }
@@ -196,7 +196,7 @@
                 devName = java::util::JniUtils::wstringToJstring(aJni,
                           *(aDiscoveredDevice.mDeviceName));
             }
-            catch (ExceptionBase ex)
+            catch (ExceptionBase &ex)
             {
                 // Nothing to handle
             }
@@ -372,7 +372,7 @@
 }
 
 int DiscoveryAgent::PopulateServiceRecordAttrValue(JNIEnv* aJni,
-        jobject& aPeer, TInt64 aRemoteAddress, long aHandle,
+        TInt64 aRemoteAddress, long aHandle,
         TPtrC16 aAttrIdsDes, jobject aServiceRecordImpl,
         java::util::Monitor* aMonitor)
 {
@@ -380,19 +380,17 @@
 
     mServiceSearchMonitor = aMonitor;
 
-    jclass peerClass = (*aJni).GetObjectClass(aPeer);
-
     LOG(EJavaBluetooth, EInfo,
         "  DiscoveryAgent::PopulateServiceRecord: Starting populating service records ");
     TRAPD(err, CallMethodL(this,
-                           &java::bluetooth::DiscoveryAgent::populateServiceRecordAttrValueFs,
+                           &java::bluetooth::DiscoveryAgent::populateServiceRecordAttrValueFsL,
                            aRemoteAddress, aHandle, aAttrIdsDes, aServiceRecordImpl,
                            mFunctionServer));
 
     return err;
 }
 
-void DiscoveryAgent::populateServiceRecordAttrValueFs(TInt64 aRemoteAddress,
+void DiscoveryAgent::populateServiceRecordAttrValueFsL(TInt64 aRemoteAddress,
         long aHandle, TPtrC16 aAttrIdsDes, jobject aServiceRecordImpl)
 {
     mServiceSearcher = BluetoothServiceSearcher::New(this, mFunctionServer);