--- a/javaextensions/bluetooth/omjbluetooth/src.s60/bluetoothstacks60native.cpp	Fri Sep 17 08:28:21 2010 +0300
+++ b/javaextensions/bluetooth/omjbluetooth/src.s60/bluetoothstacks60native.cpp	Mon Oct 04 00:10:53 2010 +0300
@@ -206,7 +206,7 @@
             ret = java::util::JniUtils::wstringToJstring(aJni, str);
         }
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::getRemoteDeviceFriendlyName Exception:%S", ex.what());
@@ -305,7 +305,7 @@
 
 JNIEXPORT jint JNICALL
 Java_com_nokia_mj_impl_bluetooth_BluetoothStackS60__1populateServiceRecordAttributeValues
-(JNIEnv *aEnv, jobject aPeer, jlong aRemoteDevice, jlong aHandle,
+(JNIEnv *aEnv, jobject /*aPeer*/, jlong aRemoteDevice, jlong aHandle,
  jintArray aAttrSet, jobject aServiceRecordImpl, jlong aDiscAgent)
 {
     JELOG2(EJavaBluetooth);
@@ -327,7 +327,7 @@
         "   JNI::populateServiceRecordAttributeValues calling PopulateServiceRecord");
     int result = KErrNone;
     result = agent->PopulateServiceRecordAttrValue(
-                 aEnv, aPeer, aRemoteDevice, aHandle, attrIdsDes, serviceRecGlobalRef,
+                 aEnv, aRemoteDevice, aHandle, attrIdsDes, serviceRecGlobalRef,
                  serviceSearchMonitor);
 
     if (KErrNone != result)
@@ -707,7 +707,7 @@
     {
         connectionUrl = JniUtils::jstringToWstring(aJni, aUrl);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::l2ServerOpen Exception:%S", ex.what());
@@ -1077,7 +1077,7 @@
     {
         connectionUrl = JniUtils::jstringToWstring(aJni, aUrl);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::rfServerOpen Exception:%S", ex.what());
@@ -1401,7 +1401,7 @@
     {
         protocol = java::util::JniUtils::jstringToWstring(aJni, aProtocol);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::initializeUpdateRecord Exception:%S", ex.what());
@@ -1450,7 +1450,7 @@
     {
         protocol = java::util::JniUtils::jstringToWstring(aJni, aProtocol);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::completesUpdateRecord Exception:%S", ex.what());
@@ -1502,7 +1502,7 @@
     {
         protocol = java::util::JniUtils::jstringToWstring(aJni, aProtocol);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::sdpAddAttribute Exception:%S", ex.what());
@@ -1655,7 +1655,7 @@
     {
         protocol = java::util::JniUtils::jstringToWstring(aJni, aProtocol);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::sdpAttributeListStart Exception:%S", ex.what());
@@ -1717,7 +1717,7 @@
     {
         protocol = java::util::JniUtils::jstringToWstring(aJni, aProtocol);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         ELOG1(EJavaBluetooth,
               "- JNI::sdpAttributeListEnd Exception:%S", ex.what());