Oops, wrong commit, reverting these two files to their previous version.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3526 a333f486-631f-4898-b8df-5754b55c2be0

synchro/synchrodatasource.class.inc.php

@@ -1824,13 +1824,6 @@ class SynchroReplica extends DBObject implements iDisplay
 	 */	
 	protected function UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, &$oStatLog, $sStatsCode, $sStatsCodeError)
 	{
-if (!is_object($oDestObj))
-{
-	IssueLog::Error('About to update a NON object in UpdateObjectFromReplica. Replica_id = '.$this->GetKey().' $oDestObj = '.var_export($oDestObj, true));
-	IssueLog::Error(MyHelpers::get_callstack_text());
-	return false;
-}
-
 		$aValueTrace = array();
 		$bModified = false;
 		try

webservices/itopsoap.examples.php

@@ -25,7 +25,7 @@
  */
 
 require_once('itopsoaptypes.class.inc.php');
-$sItopRoot = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
+$sItopRoot = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
 $sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php';
 //$sWsdlUri .= '?service_category=';
 
@@ -58,19 +58,19 @@ try
 		'HW found shutdown', /* description */
 		null, /* caller */
 		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Demo'))), /* customer */
-		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Computers and peripherals'))), /* service */
+		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW Management'))), /* service */
 		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Troubleshooting'))), /* service subcategory */
 		'', /* product */
-		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Network support'))), /* workgroup */
+		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW support'))), /* workgroup */
 		array(
 			new SOAPLinkCreationSpec(
-				'NetworkDevice',
-				array(new SOAPSearchCondition('name', 'Switch1')),
+				'Device',
+				array(new SOAPSearchCondition('name', 'switch01')),
 				array()
 			),
 			new SOAPLinkCreationSpec(
 				'Server',
-				array(new SOAPSearchCondition('name', 'Server1')),
+				array(new SOAPSearchCondition('name', 'dbserver1.demo.com')),
 				array()
 			),
 		), /* impacted cis */