vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-23 04:22:05 +01:00
Code Issues Releases Wiki Activity

SMACK-425 fix merge error

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13691 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Florian Schmaus 2013-06-24 07:25:20 +00:00 committed by flow
parent 6ed6f86293
commit 2ea5ee3b26
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/org/jivesoftware/smack/SmackConfiguration.java
View file

@ -344,17 +344,6 @@ public final class SmackConfiguration {
return autoEnableEntityCaps; return autoEnableEntityCaps;
} }
<<<<<<< HEAD
=======
/**
* Set if Entity Caps are enabled or disabled for every new connection
*
* @param true if Entity Caps should be auto enabled, false if not
*/
public static void setAutoEnableEntityCaps(boolean b) {
autoEnableEntityCaps = b;
}
/** /**
* Set the default parsing exception callback for all newly created connections * Set the default parsing exception callback for all newly created connections
* *
@ -375,7 +364,6 @@ public final class SmackConfiguration {
return defaultCallback; return defaultCallback;
} }
>>>>>>> SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza.
private static void parseClassToLoad(XmlPullParser parser) throws Exception { private static void parseClassToLoad(XmlPullParser parser) throws Exception {
String className = parser.nextText(); String className = parser.nextText();
// Attempt to load the class so that the class can get initialized // Attempt to load the class so that the class can get initialized