--- a/javacommons/connectionmanager/src.s60/connectionmanager.cpp	Thu Jul 15 18:31:06 2010 +0300
+++ b/javacommons/connectionmanager/src.s60/connectionmanager.cpp	Thu Aug 19 09:48:13 2010 +0300
@@ -65,7 +65,21 @@
 
 EXPORT_C bool ConnectionManager::isIapDefault(TUint32 aMatchIapId, TUint32 aDestId, bool aDefault)
 {
-    LOG(ESOCKET,EInfo,"+ConnectionManager::getDefualtId");
+	  LOG(ESOCKET,EInfo,"+ConnectionManager::isIapDefault");
+	  bool retVal = false;
+    TRAPD(err,retVal = checkIapDefaultL(aMatchIapId,aDestId,aDefault));
+    if(err!=KErrNone)
+    {
+        // error occured
+        return false;
+    }
+    return retVal;
+}
+
+bool ConnectionManager::checkIapDefaultL(TUint32 aMatchIapId, TUint32 aDestId, bool aDefault)
+{
+	
+    LOG(ESOCKET,EInfo,"+ConnectionManager::checkIapDefaultL");
     TUint32 id = aDestId;
     TUint32 tmpapId;
     TCmDefConnType type;
@@ -79,7 +93,7 @@
         mgr->ReadDefConnL(obj);
         id = obj.iId;
         type = obj.iType;
-        if ((type ==ECmDefConnConnectionMethod) && (type == aMatchIapId))
+        if ((type ==ECmDefConnConnectionMethod) && (id == aMatchIapId))
         {
             return true;
         }
@@ -104,8 +118,9 @@
             return true;
         }
     }
-    return false;
-
+    return false;	
+	
+	
 }
 
 // ---------------------------------------------------------------------------