Fix bug: client need to the catch conflict error.#2

Open

habzy wants to merge 1633 commits intoa-iv:masterfrom

Flowdalic:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 30, 2011

SMACK-334 FileTransferNegotiator now passes the correct type in the stream-method variable.
rcollier
committed
Fixed bug with setting the form value in ConfigureForm.setChildrenAssociationPolicy. It was trying to set a single string value instead of a list.
rcollier
committed

Commits on Mar 31, 2011

SMACK-325 patched the diff to ReconnectionManager manually.
Holger Bergunde
committed

Commits on Apr 29, 2011

SMACK-330 Added missing node attribute in the item element for pubsub.
rcollier
committed
SMACK-330 Added missing node attribute in the item element for pubsub.
rcollier
committed
Updated the build to use Java 1.6
rcollier
committed
Fixed import linked in javadoc
rcollier
committed

Commits on May 4, 2011

Updated all version info for 3.2 release.
rcollier
committed

Commits on May 12, 2011

Merge trunk (3.2 release) up to the 3.2 branch for development on 3.2.x releases.
rcollier
committed
SMACK-324 removed non base64 char from SASL response packet.
Holger Bergunde
committed

Commits on May 23, 2011

SMACK-338 this should use IBB as fallback protocol if available
Holger Bergunde
committed

Commits on May 30, 2011

adding Generics to Iterators without

wolfposd
authored and
wolf.posdorfer
committed

Commits on Jun 1, 2011

SMACK-329

wolfposd
authored and
wolf.posdorfer
committed
SMACK-273

wolfposd
authored and
wolf.posdorfer
committed

Commits on Jun 18, 2011

SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable f…
rcollier
committed

Commits on Jun 23, 2011

SMACK-230 Added synchronization since disconnect can be called from multiple threads.
rcollier
committed

Commits on Jun 29, 2011

clear all rows button now clears all rows

wolfposd
authored and
wolf.posdorfer
committed

Commits on Jul 4, 2011

Updates for Release of 3.2.1
rcollier
committed

Commits on Aug 15, 2011

Just cleaning up an import used in the javadoc.
rcollier
committed

Commits on Aug 18, 2011

SMACK-324 Applied recommended patch to remove improper stanza construction.
rcollier
committed
SMACK-348 Updated broken links.
rcollier
committed

Commits on Sep 8, 2011

Added a few more tests for pubsub configuration
rcollier
committed

Commits on Sep 9, 2011

Merged the 3.2 branch back into trunk.
rcollier
committed

Commits on Sep 21, 2011

Moved utility class to the core, since it is not extension related and useful for all code.
rcollier
committed

Commits on Oct 8, 2011

SMACK-263 Applied patch for setting file info for transfer
rcollier
committed

Commits on Oct 9, 2011

Commits on Dec 16, 2011

SMACK-354 Provide milliseconds in timestamp colum debugwindow
Tim Jentz
committed

Commits on Dec 19, 2011

Commits on Dec 21, 2011

Commits on Jan 27, 2012

SMACK-349 Couple of fixes to test cases based on changes in base64 encoding buffer sizes.
rcollier
committed

Commits on Feb 5, 2012

Build fix for release
rcollier
committed

Commits on Feb 7, 2012

Merge of 3.2 stream back into trunk
rcollier
committed

Commits on Oct 26, 2012

SMACK-363 Applied code cleanup patches for many generics related issues.
rcollier
committed

Commits on Oct 30, 2012

SMACK-390 Log exception in parsing extensions of Presence. Valid Presence will still be returned with extensions missing.
rcollier
committed

Commits on Nov 22, 2012

Commits on Jan 4, 2013

Commits on Jan 5, 2013

Fix erroneous cast from byte to int in IBBInputStream's read()

Flowdalic
authored and
flow
committed

Commits on Jan 6, 2013

Fixed typo

Flowdalic
authored and
flow
committed
KeepAliveTask: Increased the initial heartbeat dealy in order to

Flowdalic
authored and
flow
committed
SMACK-278: Call socket.close() in XMPPConnection.shutdown() before

Flowdalic
authored and
flow
committed

Commits on Jan 11, 2013

PingManager: removed debug message that claims to be a error message

Flowdalic
authored and
flow
committed

Commits on Jan 15, 2013

SMACK-388 Moved PingProvider, Ping and Pong under ../smackx/ping package

Flowdalic
authored and
flow
committed

Commits on Jan 21, 2013

Enabled smackx unit tests for 'test-unit' target

Flowdalic
authored and
flow
committed
Whitespace fixes in build.xml

Flowdalic
authored and
flow
committed
build.xml: Fixed accidentially deleted 'junit-' at target test-unit

Flowdalic
authored and
flow
committed
build.xml: Added jar-test-smackx target and let test-unit depend on that, so that clean calls of 'ant test-unit' won't fail.

Flowdalic
authored and
flow
committed

Commits on Jan 25, 2013

PingManager: Don't register IQProvider since this is done by smack.providers already. This line was actually a leftover from aSmack development.

Flowdalic
authored and
flow
committed

Commits on Jan 26, 2013

fix typo in PingManager.getInstanceFor() function name

Flowdalic
authored and
flow
committed

Commits on Jan 28, 2013

SMACK-403 add support for

Flowdalic
authored and
flow
committed
SMACK-403 Correct location of the Forwarded Provider

Flowdalic
authored and
flow
committed
SMACK-388 register PingProvider with smack.providers. The static register code was removed with 13406 (http://fisheye.igniterealtime.org/changelog/smack?cs=13406)

Flowdalic
authored and
flow
committed

Commits on Jan 29, 2013

Commits on Jan 31, 2013

Commits on Feb 1, 2013

Remove .settings from the 'all' target in Makefile

Flowdalic
authored and
flow
committed

Commits on Feb 4, 2013

Commits on Feb 6, 2013

SMACK-407 Time zones now parse correctly.
rcollier
committed

Commits on Feb 7, 2013

Commits on Feb 11, 2013

ServiceDiscoveryManager: Anounce 'disco#info' and 'disco#items' on service discovery queries in accordance with XEP-0030

Flowdalic
authored and
flow
committed
ServiceDiscoveryManager: Use 'Set' as data structure for features to prevent reporting duplicate features

Flowdalic
authored and
flow
committed

Commits on Feb 14, 2013

Makefile: added javadoc target

Flowdalic
authored and
flow
committed
PingManager: Fixed imports

Flowdalic
authored and
flow
committed
SMACK-345: Improved detection of last activity. Properly synchronized access to lastMessageSent and registerd last activity namespace with ServiceDiscoveryManager. Improved LastActivity Provider

Flowdalic
authored and
flow
committed
Updated eclipse settings: if else, javadoc line length

Flowdalic
authored and
flow
committed
SMACK-358: Support account creation parameters for LoginTest.testLoginWithNoResource()

Flowdalic
authored and
flow
committed
Aligned integration test config file 'test-case.xml' settings to reflect the defaults in SmackTestCase. Renamed the file to test-case.example.xml and added remark about the usage of the file

Flowdalic
authored and
flow
committed

Commits on Feb 26, 2013

SMACK-376 Allow supplying a custom SSLContext for encrypted connections.

Flowdalic
authored and
flow
committed
SMACK-379 Removed mandatory session establishment, since it was dropped from the newer XMPP-IM RFC (a.k.a. RFC 6121)

Flowdalic
authored and
flow
committed
SMACK-389 Plugable compression framework

Flowdalic
authored and
flow
committed

Commits on Feb 27, 2013

SMACK-388

Flowdalic
authored and
flow
committed

Commits on Feb 28, 2013

Branch for finishing up the remaining tasks for 3.3. Allowing development to continue on trunk.
rcollier
committed
rcollier
committed
rcollier
committed

Commits on Mar 5, 2013

Commits on Mar 18, 2013

SMACK-361 Added support for Entity Capabilities.

Flowdalic
authored and
flow
committed
SMACK-225 Fixed DNS SRV handling, as per RFC 2782. Added support for multiple DNS SRV resolvers namely javax and org.xbill.dns (aka dnsjava).

Flowdalic
authored and
flow
committed
SMACK-361 Added support for Entity Capabilities.

Flowdalic
authored and
flow
committed
SMACK-225 Fixed DNS SRV handling, as per RFC 2782. Added support for multiple DNS SRV resolvers namely javax and org.xbill.dns (aka dnsjava).

Flowdalic
authored and
flow
committed
SMACK-419 PacketWriter: Only flush if queue is empty

Flowdalic
authored and
flow
committed
SMACK-417 If both PacketReader and PacketWriter fail at the same time, connectionClosedonError() is called two times

Flowdalic
authored and
flow
committed
SMACK-419 PacketWriter: Only flush if queue is empty

Flowdalic
authored and
flow
committed
SMACK-417 If both PacketReader and PacketWriter fail at the same time, connectionClosedonError() is called two times

Flowdalic
authored and
flow
committed

Commits on Mar 19, 2013

Commits on Mar 22, 2013

Added isFullJID() helper in StringUtils

Flowdalic
authored and
flow
committed
SMACK-430 Re-activated code that throws an exception if createOutgoingFileTransfer() was called with a bare JID

Flowdalic
authored and
flow
committed
SMACK-384 Don't use a semaphore while waiting for PacketReader to be started.

Flowdalic
authored and
flow
committed
SMACK-382 Prevent memory leak in AdHocCommandManager by only creating the Thread if it's actually needed

Flowdalic
authored and
flow
committed
Added isFullJID() helper in StringUtils

Flowdalic
authored and
flow
committed
SMACK-430 Re-activated code that throws an exception if createOutgoingFileTransfer() was called with a bare JID

Flowdalic
authored and
flow
committed
SMACK-384 Don't use a semaphore while waiting for PacketReader to be started.

Flowdalic
authored and
flow
committed
SMACK-382 Prevent memory leak in AdHocCommandManager by only creating the Thread if it's actually needed

Flowdalic
authored and
flow
committed

Commits on Mar 23, 2013

Commits on Mar 24, 2013

SMACK-413 Put removed public method back in and marked as deprecated. We can remove in major release.
rcollier
committed

Commits on Mar 31, 2013

Commits on Apr 1, 2013

SMACK-225 Converted abstract class to interface, added missing hashcode method, fixed typos and some minor name changes and added licensing text
rcollier
committed

Commits on Apr 2, 2013

SMACK-331 Changed methods to existing Smack conventions and moved interface to top level.
rcollier
committed

Commits on Apr 7, 2013

Commits on Apr 16, 2013

Commits on Apr 20, 2013

Commits on Apr 22, 2013

SMACK-433 Removed Thread.sleep usage for tests
rcollier
committed
SMACK-433 Removed unnecessary reset of timeout.
rcollier
committed

Commits on Apr 27, 2013

SMACK-415 Added fix for handling the empty tag case.
rcollier
committed

Commits on Apr 29, 2013

SMACK-415 Added code that was mistakenly removed to handle optional node attribute
rcollier
committed

Commits on May 3, 2013

SMACK-437 Replaced 'String.isEmpty()' with 'String.length() > 0'

Flowdalic
authored and
flow
committed

Commits on May 4, 2013

Updated version information for 3.3 release.
rcollier
committed
Updated changelog for 3.3 release.
rcollier
committed

Commits on May 12, 2013

SMACK-438 Avoid NPE when the weak reference is null. Add InvitationsMonitor as strong reference within getInvitationsMonitor and return it within the block so it can't get gc'ed between put() and g…

Flowdalic
authored and
flow
committed
SMACK-439

Flowdalic
authored and
flow
committed

Commits on May 17, 2013

Created 3.3.1 branch

Flowdalic
authored and
flow
committed
SMACK-438 Avoid NPE when the weak reference is null. Add InvitationsMonitor as strong reference within getInvitationsMonitor and return it within the block so it can't get gc'ed between put() and g…

Flowdalic
authored and
flow
committed
SMACK-439

Flowdalic
authored and
flow
committed
SMACK-369 remove try/catch block in XMPPConnection.connect()

Flowdalic
authored and
flow
committed
Spelling fixes

Flowdalic
authored and
flow
committed
SMACK-428 add 'public int RosterEntry.hashCode()'

Flowdalic
authored and
flow
committed

Commits on May 18, 2013

Merge from 3.3 branch
rcollier
committed

Commits on Jun 22, 2013

Commits on Jun 24, 2013

SMACK-425 fix merge error

Flowdalic
authored and
flow
committed
SMACK-431 Reworded Entity Caps documentation, added missing frame link

Flowdalic
authored and
flow
committed
SMACK-448 Java7ZlibInputOutputStream: Use correct Deflater compression level

Flowdalic
authored and
flow
committed

Commits on Jun 25, 2013

SMACK-448 Java7ZlibInputOutputStream: Use correct Deflater compression level

Flowdalic
authored and
flow
committed

Commits on Jun 30, 2013

SMACK-441 Create packet collector only when necessary
rcollier
committed

Commits on Jul 12, 2013

SMACK-450 Make VCard.doLoad() return if the received packet was not an error and also not an VCard. Avoid calling VCard.load() with 'null' as argument.

Flowdalic
authored and
flow
committed

Commits on Sep 16, 2013

SMACK-451 Moved providers declaration for ping manager as it was in the middle of the ad-hoc entries
rcollier
committed

Commits on Oct 5, 2013

SMACK-425 Few changes based on review http://fisheye.igniterealtime.org/cru/SMACK-4
rcollier
committed

Commits on Oct 7, 2013

SMACK-455 Fixed improper advance of parser when parsing multiple items in a pubsub message.
rcollier
committed
Versioning updates for new release.
rcollier
committed

Commits on Oct 9, 2013

Created 3.3.2 branch

Flowdalic
authored and
flow
committed
SMACK-456 Added the causing exception

Flowdalic
authored and
flow
committed
SMACK-444 Allow 'null' for options in ServerTrustManager

Flowdalic
authored and
flow
committed
SMACK-452 Correctly parse stream error packets

Flowdalic
authored and
flow
committed

Commits on Oct 17, 2013

SMACK-457 Remove unnecessary printStackTrace() in XMPPConnection

Flowdalic
authored and
flow
committed

Commits on Oct 22, 2013

SMACK-431 Reworded Entity Caps documentation, added missing frame link

Flowdalic
authored and
flow
committed
SMACK-441 ServiceDiscoveryManager identities should be non-static and kept in a Set to allow multiple identities as per XEP-0030

Flowdalic
authored and
flow
committed
SMACK-442 Manager should also handle connectionClosedOnError()

Flowdalic
authored and
flow
committed

Commits on Oct 26, 2013

SMACK-458 Managers should be kept on disconnects

Flowdalic
authored and
flow
committed
SMACK-443 remove duplicate notifyReconnection()

Flowdalic
authored and
flow
committed
SMACK-459 Add option to configure the default identity in ServiceDiscoveryManager

Flowdalic
authored and
flow
committed
SMACK-461 Remove incorrect deprecated marker for DiscoverInfo.Identity.setType()

Flowdalic
authored and
flow
committed
SMACK-460 ServiceDiscoveryManager constructor usage in

Flowdalic
authored and
flow
committed

Commits on Oct 27, 2013

SMACK-373 Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login()

Flowdalic
authored and
flow
committed

Commits on Oct 31, 2013

SMACK-459 actually add the defaultIdentity to the result of getIdentities()

Flowdalic
authored and
flow
committed
SMACK-459 Make it user proof by returning an unmodifiable set again

Flowdalic
authored and
flow
committed

Commits on Nov 2, 2013

SMACK-339 Allow ConnectionListeners to be added before Connection is connected

Flowdalic
authored and
flow
committed

Commits on Nov 3, 2013

SMACK-361 Minor EntityCapsManager fixes

Flowdalic
authored and
flow
committed
SMACK-462 Use getInstace() ConnectionCreationListener

Flowdalic
authored and
flow
committed

Commits on Nov 4, 2013

Fix caps support (SMACK-361, SMACK-459).

Flowdalic
authored and
flow
committed

Commits on Nov 5, 2013

SMACK-463 Catch and log exceptions in packet listeners

Flowdalic
authored and
flow
committed

Commits on Dec 30, 2013

Merge branch smack_3_3_2 and trunk
Flowdalic
committed

Commits on Jan 15, 2014

rcollier
committed

Commits on Jan 16, 2014

SMACK-286 Made ProviderManager much more configurable.
rcollier
committed

Commits on Jan 17, 2014

SMACK-525 fix NPE when initConnection() fails

Flowdalic
authored and
flow
committed
SMACK-524 Use correct block-size definition for IBB transfers

Flowdalic
authored and
flow
committed

Commits on Jan 19, 2014

Added version info to the release build zip/tar file
rcollier
committed

Commits on Jan 20, 2014

Commits on Jan 22, 2014

SMACK-403 Added support for Stanza forwarding.
rcollier
committed
SMACK-530 Moved DNSUtilTest to integration tests
rcollier
committed
SMACK-286 Fixed ant test-unit target to work with configuration changes
rcollier
committed

Commits on Jan 25, 2014

Added some versioning to the jar files to match the versioning on the release build.
rcollier
committed

Commits on Jan 26, 2014

SMACK-343 Made all non core jars set the smack jar as the fragment host.
rcollier
committed

Commits on Jan 31, 2014

Commits on Feb 1, 2014

Commits on Feb 2, 2014

Commits on Feb 4, 2014

Commits on Feb 5, 2014

Commits on Feb 7, 2014

Commits on Feb 8, 2014

Use '-' as separator for $version.extra in build.xml
Flowdalic
committed

Commits on Feb 9, 2014

Smack 3.4.1
Flowdalic
committed

Commits on Feb 10, 2014