Projects >> SOCIETIES-Platform >>beee4c198f6573a14d3dd923146680fdcc757068

Chunk
Conflicting content 
							snsEntitiesSet);

					LOG.debug("lookup SN association" + snName);
<<<<<<< HEAD
					List snEntList = this.internalCtxBroker
							.lookupEntities(snsEntitiesList,
									CtxAttributeTypes.NAME, snName).get();

=======
					List snEntList 		= this.internalCtxBroker.lookupEntities(snsEntitiesList, CtxAttributeTypes.TYPE, snName).get();
					//List snEntList 		= this.internalCtxBroker.lookupEntities(snsEntitiesList, CtxAttributeTypes.NAME, snName).get();
>>>>>>> 9f1229447f4561dbc4557bde8b0472653708885d
					if (snEntList.size() > 0) {
						socialNetwork = (CtxEntity) this.internalCtxBroker
								.retrieve(snEntList.get(0)).get();
Solution content 
					LOG.debug("lookup SN association" + snName);

//					List snEntList = this.internalCtxBroker.lookupEntities(snsEntitiesList, CtxAttributeTypes.NAME, snName).get();

					List snEntList 		= this.internalCtxBroker.lookupEntities(snsEntitiesList, CtxAttributeTypes.TYPE, snName).get();
					//List snEntList 		= this.internalCtxBroker.lookupEntities(snsEntitiesList, CtxAttributeTypes.NAME, snName).get();

					if (snEntList.size() > 0) {
File
ContextUpdater.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
			}

<<<<<<< HEAD
			LOG.info("NO Asscotiation found  the User Entity");
			snsAssoc = this.internalCtxBroker.createAssociation(
					CtxAssociationTypes.IS_CONNECTED_TO_SNS).get();
			LOG.info("---> snsAssoc created ");

			List snEntitiesList = this.internalCtxBroker
					.lookupEntities(CtxEntityTypes.SOCIAL_NETWORK,
							CtxAttributeTypes.NAME, snName, snName).get();

			if (snEntitiesList.size() == 0) {
				LOG.info("No SocialNetwork entity for this SN:" + snName);
				socialNetwork = this.internalCtxBroker.createEntity(
						CtxEntityTypes.SOCIAL_NETWORK).get();
				LOG.info("SOCIAL_NETWORK entity created "
						+ socialNetwork.getId());
				CtxAttribute snsNameAttr = this.internalCtxBroker
						.createAttribute(socialNetwork.getId(),
								CtxAttributeTypes.NAME).get();
				snsNameAttr.setStringValue(snName);
				this.internalCtxBroker.update(snsNameAttr);

			}
=======
				snsAssoc = this.internalCtxBroker.createAssociation(CtxAssociationTypes.IS_CONNECTED_TO_SNS).get();
				LOG.info("snsAssoc created ");
				
				List snEntitiesList = this.internalCtxBroker.lookupEntities(CtxEntityTypes.SOCIAL_NETWORK,CtxAttributeTypes.TYPE, snName, snName).get();
				//List snEntitiesList = this.internalCtxBroker.lookupEntities(CtxEntityTypes.SOCIAL_NETWORK,CtxAttributeTypes.NAME, snName, snName).get();
				
				if (snEntitiesList.size() == 0) {
					socialNetwork = this.internalCtxBroker.createEntity(CtxEntityTypes.SOCIAL_NETWORK).get();
					LOG.info("SOCIAL_NETWORK entity created "+socialNetwork.getId());
					CtxAttribute snsNameAttr = this.internalCtxBroker.createAttribute(socialNetwork.getId(), CtxAttributeTypes.TYPE).get();
					//CtxAttribute snsNameAttr = this.internalCtxBroker.createAttribute(socialNetwork.getId(), CtxAttributeTypes.NAME).get();
					snsNameAttr.setStringValue(snName);
					this.internalCtxBroker.update(snsNameAttr);
>>>>>>> 9f1229447f4561dbc4557bde8b0472653708885d

			else {
				socialNetwork = (CtxEntity) this.internalCtxBroker.retrieve(
Solution content 
			}


			LOG.info("NO Asscotiation found  the User Entity");
			snsAssoc = this.internalCtxBroker.createAssociation(CtxAssociationTypes.IS_CONNECTED_TO_SNS).get();
			LOG.info("---> snsAssoc created ");

			List snEntitiesList = this.internalCtxBroker.lookupEntities(CtxEntityTypes.SOCIAL_NETWORK, CtxAttributeTypes.TYPE, snName, snName).get();

			if (snEntitiesList.size() == 0) {
				LOG.info("No SocialNetwork entity for this SN:" + snName);
				socialNetwork = this.internalCtxBroker.createEntity(CtxEntityTypes.SOCIAL_NETWORK).get();
				LOG.info("SOCIAL_NETWORK entity created " + socialNetwork.getId());
				CtxAttribute snsNameAttr = this.internalCtxBroker.createAttribute(socialNetwork.getId(),CtxAttributeTypes.TYPE).get();
				snsNameAttr.setStringValue(snName);
				this.internalCtxBroker.update(snsNameAttr);

			}


			else {
				socialNetwork = (CtxEntity) this.internalCtxBroker.retrieve(
File
ContextUpdater.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Variable