--- a/javaextensions/sensor/src.s60/cacceleratorsensor.cpp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javaextensions/sensor/src.s60/cacceleratorsensor.cpp	Wed Oct 13 14:23:59 2010 +0300
@@ -297,6 +297,7 @@
 
 void CAcceleratorSensor::OpenChannelL()
 {
+    TInt err;
     JELOG2(ESensor);
     LOG(ESensor,EInfo,"Creating Open Channel");
     iChannel->OpenChannelL();
@@ -305,9 +306,9 @@
     iScaleFactor = 1;
     TInt format(ESensrvChannelDataFormatAbsolute);
     TSensrvProperty property;
-    iChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, KSensrvItemIndexNone,
-                                      property);
-    
+    TRAP(err,iChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, KSensrvItemIndexNone,
+                                      property););
+    LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() One = %d",err);
 
     if (property.PropertyType() == ESensrvIntProperty)
     {
@@ -327,17 +328,19 @@
         // Scaled value maximum
         TSensrvProperty property_scaled;
         TInt maxScaled(0);
-       iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
-                                          property_scaled);
-        
+        TRAP(err,iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
+                                          property_scaled););
+        LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Two = %d",err);
 
         if (property_scaled.GetArrayIndex() == ESensrvArrayPropertyInfo)
         {
             LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::If");
             //for 2G Accelerometer Sensor index value is 0.
             TInt rangeIndex(0);
-            iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
-                                              rangeIndex, property_scaled);
+            TRAP(err,iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
+                                              rangeIndex, property_scaled););
+            LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Three = %d",err);
+
             property_scaled.GetMaxValue(maxScaled);
 
             LOG1(ESensor,EInfo,"property_scaled::maxValue = %d",maxScaled);
@@ -350,32 +353,36 @@
         }
         // MeasureRange can be an array property
         TReal maxMeasure;
-        
+        TInt err1;
         TSensrvProperty property_Measured;
-        iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
-                                          property_Measured);
-             
-        TInt arrayIndex = property_Measured.GetArrayIndex();
-        LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::KSensrvPropIdMeasureRange::arrayIndex = %d",arrayIndex);
+        TRAP(err1,iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
+                                          property_Measured););
+        LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Four = %d",err1);
 
-        if (property_Measured.GetArrayIndex() == ESensrvArrayPropertyInfo)
+        if (err1 == KErrNone)
         {
-            LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::If");
+            TInt arrayIndex = property_Measured.GetArrayIndex();
+            LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::KSensrvPropIdMeasureRange::arrayIndex = %d",arrayIndex);
+
+            if (property_Measured.GetArrayIndex() == ESensrvArrayPropertyInfo)
+            {
+                LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::If");
 
-            TInt index2g = 0;
-            LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::Getting RangeIndex = %f",index2g);
-            //We need to TypeCast variable rangeIndex to TInt for
-            iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
-                                              index2g, property_Measured);
-            property_Measured.GetMaxValue(maxMeasure);
+                TInt index2g = 0;
+                LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::Getting RangeIndex = %f",index2g);
+                //We need to TypeCast variable rangeIndex to TInt for
+                TRAP(err,iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
+                                                  index2g, property_Measured););
+                LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Five = %d",err);
+                property_Measured.GetMaxValue(maxMeasure);
+            }
+            else
+            {
+                LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::else");
+                property_Measured.GetMaxValue(maxMeasure);
+            }
+
         }
-        else
-        {
-            LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::else");
-            property_Measured.GetMaxValue(maxMeasure);
-        }
-
-        
         iScaleFactor = maxMeasure / maxScaled ;
         LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::iScaleFactor = %f",iScaleFactor);
     }