libtransport.git Changeset - 7b5810a41076

Changeset - 7b5810a41076

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-08-21 22:52:05
hanzz.k@gmail.com

Removed old hack which cause crash in some situations

1 file changed with 3 insertions and 17 deletions:

src/rosterresponder.cpp

0 comments (0 inline, 0 general)

src/rosterresponder.cpp

➞

Show inline comments

 	// For now we send empty reponse, but TODO: Get buddies from database and send proper stored roster.
 	User *user = m_userManager->getUser(from.toBare().toString());
 	if (!user) {
 		LOG4CXX_INFO(logger, from.toBare().toString() << ": Sending roster");
 		// Client can send jabber:iq:roster IQ before presence, so we do little hack here to
 		// trigger logging in.
 		// UserManager should create user now, if everything is OK.
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(to);
 		response->setFrom(from);
 		response->setType(Swift::Presence::Available);
 		m_userManager->handlePresence(response);
 		// if it's not created, lets finish this get
 		user = m_userManager->getUser(from.toBare().toString());
 		if (!user) {
 			sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
 			LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
 			return true;
+		}
 		sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
 		LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
 		return true;
+	}
 	sendResponse(from, id, user->getRosterManager()->generateRosterPayload());
 	user->getRosterManager()->sendCurrentPresences(from);

0 comments (0 inline, 0 general)