--- a/javacommons/connectionmanager/src.s60/connectionmanager.cpp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javacommons/connectionmanager/src.s60/connectionmanager.cpp	Wed Oct 13 14:23:59 2010 +0300
@@ -65,21 +65,7 @@
 
 EXPORT_C bool ConnectionManager::isIapDefault(TUint32 aMatchIapId, TUint32 aDestId, bool aDefault)
 {
-	  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");
+    LOG(ESOCKET,EInfo,"+ConnectionManager::getDefualtId");
     TUint32 id = aDestId;
     TUint32 tmpapId;
     TCmDefConnType type;
@@ -118,9 +104,8 @@
             return true;
         }
     }
-    return false;	
-	
-	
+    return false;
+
 }
 
 // ---------------------------------------------------------------------------
@@ -304,7 +289,7 @@
     {
         JavaStorageApplicationEntry_t::const_iterator findIterator = entries.find(attribute);
 
-        if (findIterator != entries.end())
+        if (findIterator != entries.end() && findIterator->entryValue().length()>0 )
         {
             JavaStorageEntry sourceEntry = (*findIterator);
             temp.append(sourceEntry.entryValue().c_str());