Replace tabs with spaces

Adds incrByFloat as cluster command

.gitignore

@@ -12,3 +12,4 @@ tags
 .idea
 *.aof
 *.rdb
+.maven

LICENSE

@@ -0,0 +1,619 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.

build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'eclipse'
 
-group = 'com.googlecode.jedis'
-archivesBaseName = 'jedis'
-version = '1.5.0'
+group = 'com.github.boukefalos'
+archivesBaseName = 'jlibredis'
+version = '2.6.2'
 
 repositories {
    mavenCentral()
@@ -15,19 +15,12 @@ dependencies {
     compile 'org.apache.commons:commons-pool2:2.0'
 }
 
+task wrapper(type: Wrapper) {
+	gradleVersion = '2.2'
+}
 
-/*
-TODO: Customize for deployment
 uploadArchives {
 	repositories.mavenDeployer {
-        repository(url: "file://localhost/repo/") {
-            authentication(userName: "user", password: "pass")
+		repository(url: uri('.maven'))
 	}
 }
-}
-*/
-
-task createWrapper(type: Wrapper) {
-    gradleVersion = '1.8'
-}
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 04 18:13:13 EST 2013
+#Sun Nov 30 11:33:11 GMT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.2-bin.zip

pom.xml

@@ -9,7 +9,7 @@
 	<packaging>jar</packaging>
 	<groupId>redis.clients</groupId>
 	<artifactId>jedis</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>2.6.2-SNAPSHOT</version>
 	<name>Jedis</name>
 	<description>Jedis is a blazingly small and sane Redis java client.</description>
   <url>https://github.com/xetorthio/jedis</url>

src/main/java/redis/clients/jedis/BinaryJedis.java

@@ -253,9 +253,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     public Set<byte[]> keys(final byte[] pattern) {
     checkIsInMulti();
     client.keys(pattern);
-	final HashSet<byte[]> keySet = new HashSet<byte[]>(
-		client.getBinaryMultiBulkReply());
-	return keySet;
+    return new HashSet<byte[]>(client.getBinaryMultiBulkReply());
     }
 
     /**
@@ -519,7 +517,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 
     /**
      * Set the the respective keys to the respective values. MSET will replace
-     * old values with new values, while {@link #msetnx(String...) MSETNX} will
+     * old values with new values, while {@link #msetnx(byte[]...) MSETNX} will
      * not perform any operation at all even if just a single key already
      * exists.
      * <p>
@@ -532,7 +530,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * either see the changes to both A and B at once, or no modification at
      * all.
      * 
-     * @see #msetnx(String...)
+     * @see #msetnx(byte[]...)
      * 
      * @param keysvalues
      * @return Status code reply Basically +OK as MSET can't fail
@@ -545,7 +543,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 
     /**
      * Set the the respective keys to the respective values.
-     * {@link #mset(String...) MSET} will replace old values with new values,
+     * {@link #mset(byte[]...) MSET} will replace old values with new values,
      * while MSETNX will not perform any operation at all even if just a single
      * key already exists.
      * <p>
@@ -558,7 +556,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * either see the changes to both A and B at once, or no modification at
      * all.
      * 
-     * @see #mset(String...)
+     * @see #mset(byte[]...)
      *
      * @param keysvalues
      * @return Integer reply, specifically: 1 if the all the keys were set 0 if
@@ -571,7 +569,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     }
 
     /**
-     * IDECRBY work just like {@link #decr(String) INCR} but instead to
+     * DECRBY work just like {@link #decr(byte[]) INCR} but instead to
      * decrement by 1 the decrement is integer.
      * <p>
      * INCR commands are limited to 64 bit signed integers.
@@ -655,7 +653,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     }
 
     /**
-     * INCRBYFLOAT work just like {@link #incrBy(byte[]) INCRBY} but increments
+     * INCRBYFLOAT work just like {@link #incrBy(byte[], long)} INCRBY} but increments
      * by floats instead of integers.
      * <p>
      * INCRBYFLOAT commands are limited to double precision floating point
@@ -673,8 +671,8 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * @see #decr(byte[])
      * @see #decrBy(byte[], long)
      * 
-     * @param key
-     * @param integer
+     * @param key the key to increment
+     * @param integer the value to increment by
      * @return Integer reply, this commands will reply with the new value of key
      *         after the increment.
      */
@@ -978,8 +976,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     public List<byte[]> hvals(final byte[] key) {
     checkIsInMulti();
     client.hvals(key);
-	final List<byte[]> lresult = client.getBinaryMultiBulkReply();
-	return lresult;
+    return client.getBinaryMultiBulkReply();
     }
 
     /**
@@ -1184,7 +1181,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * O(N) (with N being the length of the list), setting the first or last
      * elements of the list is O(1).
      * 
-     * @see #lindex(byte[], int)
+     * @see #lindex(byte[], long)
      * 
      * @param key
      * @param index
@@ -1305,11 +1302,11 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 
     /**
      * Return all the members (elements) of the set value stored at key. This is
-     * just syntax glue for {@link #sinter(String...) SINTER}.
+     * just syntax glue for {@link #sinter(byte[]...)} SINTER}.
      * <p>
      * Time complexity O(N)
      * 
-     * @param key
+     * @param key the key of the set
      * @return Multi bulk reply
      */
     public Set<byte[]> smembers(final byte[] key) {
@@ -1326,8 +1323,8 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * <p>
      * Time complexity O(1)
      * 
-     * @param key
-     * @param member
+     * @param key the key of the set
+     * @param member the set member to remove
      * @return Integer reply, specifically: 1 if the new element was removed 0
      *         if the new element was not a member of the set
      */
@@ -1420,7 +1417,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     /**
      * Return the members of a set resulting from the intersection of all the
      * sets hold at the specified keys. Like in
-     * {@link #lrange(byte[], int, int) LRANGE} the result is sent to the client
+     * {@link #lrange(byte[], long, long)} LRANGE} the result is sent to the client
      * as a multi-bulk reply (see the protocol specification for more
      * information). If just a single key is specified, then this command
      * produces the same result as {@link #smembers(byte[]) SMEMBERS}. Actually
@@ -1444,7 +1441,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     }
 
     /**
-     * This commnad works exactly like {@link #sinter(String...) SINTER} but
+     * This commnad works exactly like {@link #sinter(byte[]...) SINTER} but
      * instead of being returned the resulting set is sotred as dstkey.
      * <p>
      * Time complexity O(N*M) worst case where N is the cardinality of the
@@ -1462,7 +1459,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 
     /**
      * Return the members of a set resulting from the union of all the sets hold
-     * at the specified keys. Like in {@link #lrange(byte[], int, int) LRANGE}
+     * at the specified keys. Like in {@link #lrange(byte[], long, long)} LRANGE}
      * the result is sent to the client as a multi-bulk reply (see the protocol
      * specification for more information). If just a single key is specified,
      * then this command produces the same result as {@link #smembers(byte[])
@@ -1484,7 +1481,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     }
 
     /**
-     * This command works exactly like {@link #sunion(String...) SUNION} but
+     * This command works exactly like {@link #sunion(byte[]...) SUNION} but
      * instead of being returned the resulting set is stored as dstkey. Any
      * existing value in dstkey will be over-written.
      * <p>
@@ -1532,7 +1529,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     }
 
     /**
-     * This command works exactly like {@link #sdiff(String...) SDIFF} but
+     * This command works exactly like {@link #sdiff(byte[]...) SDIFF} but
      * instead of being returned the resulting set is stored in dstkey.
      * 
      * @param dstkey
@@ -1726,16 +1723,14 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
         final long end) {
     checkIsInMulti();
     client.zrangeWithScores(key, start, end);
-	Set<Tuple> set = getBinaryTupledSet();
-	return set;
+    return getBinaryTupledSet();
     }
 
     public Set<Tuple> zrevrangeWithScores(final byte[] key, final long start,
         final long end) {
     checkIsInMulti();
     client.zrevrangeWithScores(key, start, end);
-	Set<Tuple> set = getBinaryTupledSet();
-	return set;
+    return getBinaryTupledSet();
     }
 
     /**
@@ -1995,7 +1990,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * <p>
      * Time complexity: O(1)
      * 
-     * @see #brpop(int, String...)
+     * @see #brpop(int, byte[]...)
      * 
      * @param timeout
      * @param keys
@@ -2008,18 +2003,17 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      *         programming language used.
      */
     public List<byte[]> blpop(final int timeout, final byte[]... keys) {
-	checkIsInMulti();
-	final List<byte[]> args = new ArrayList<byte[]>();
-	for (final byte[] arg : keys) {
-	    args.add(arg);
+    return blpop(getArgsAddTimeout(timeout, keys));
     }
-	args.add(Protocol.toByteArray(timeout));
 
-	client.blpop(args.toArray(new byte[args.size()][]));
-	client.setTimeoutInfinite();
-	final List<byte[]> multiBulkReply = client.getBinaryMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    private byte[][] getArgsAddTimeout (int timeout, byte[][] keys) {
+    int size = keys.length;
+    final byte[][] args = new byte[size + 1][];
+    for (int at = 0; at != size; ++at) {
+        args[at] = keys[at];
+    }
+    args[size] = Protocol.toByteArray(timeout);
+    return args;
     }
 
     /**
@@ -2124,7 +2118,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * <p>
      * Time complexity: O(1)
      * 
-     * @see #blpop(int, String...)
+     * @see #blpop(int, byte[]...)
      * 
      * @param timeout
      * @param keys
@@ -2137,59 +2131,46 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      *         programming language used.
      */
     public List<byte[]> brpop(final int timeout, final byte[]... keys) {
-	checkIsInMulti();
-	final List<byte[]> args = new ArrayList<byte[]>();
-	for (final byte[] arg : keys) {
-	    args.add(arg);
-	}
-	args.add(Protocol.toByteArray(timeout));
-
-	client.brpop(args.toArray(new byte[args.size()][]));
-	client.setTimeoutInfinite();
-	final List<byte[]> multiBulkReply = client.getBinaryMultiBulkReply();
-	client.rollbackTimeout();
-
-	return multiBulkReply;
+    return brpop(getArgsAddTimeout(timeout, keys));
     }
 
+
+    /**
+     * @deprecated unusable command, this command will be removed in 3.0.0.
+     */
+    @Deprecated
     public List<byte[]> blpop(byte[] arg) {
-	checkIsInMulti();
-	byte[][] args = new byte[1][];
-	args[0] = arg;
-	client.blpop(args);
-	client.setTimeoutInfinite();
-	final List<byte[]> multiBulkReply = client.getBinaryMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    return blpop(new byte[][]{arg});
     }
 
+    /**
+     * @deprecated unusable command, this command will be removed in 3.0.0.
+     */
+    @Deprecated
     public List<byte[]> brpop(byte[] arg) {
-	checkIsInMulti();
-	byte[][] args = new byte[1][];
-	args[0] = arg;
-	client.brpop(args);
-	client.setTimeoutInfinite();
-	final List<byte[]> multiBulkReply = client.getBinaryMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    return brpop(new byte[][]{arg});
     }
 
     public List<byte[]> blpop(byte[]... args) {
     checkIsInMulti();
     client.blpop(args);
     client.setTimeoutInfinite();
-	final List<byte[]> multiBulkReply = client.getBinaryMultiBulkReply();
+    try {
+        return client.getBinaryMultiBulkReply();
+    } finally {
         client.rollbackTimeout();
-	return multiBulkReply;
+    }
     }
 
     public List<byte[]> brpop(byte[]... args) {
     checkIsInMulti();
     client.brpop(args);
     client.setTimeoutInfinite();
-	final List<byte[]> multiBulkReply = client.getBinaryMultiBulkReply();
+    try {
+        return client.getBinaryMultiBulkReply();
+    } finally {
         client.rollbackTimeout();
-	return multiBulkReply;
+    }
     }
 
     /**
@@ -2431,8 +2412,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
         final byte[] min, final byte[] max) {
     checkIsInMulti();
     client.zrangeByScoreWithScores(key, min, max);
-	Set<Tuple> set = getBinaryTupledSet();
-	return set;
+    return getBinaryTupledSet();
     }
 
     /**
@@ -2503,8 +2483,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
         final int count) {
     checkIsInMulti();
     client.zrangeByScoreWithScores(key, min, max, offset, count);
-	Set<Tuple> set = getBinaryTupledSet();
-	return set;
+    return getBinaryTupledSet();
     }
 
     private Set<Tuple> getBinaryTupledSet() {
@@ -2561,8 +2540,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
         final byte[] max, final byte[] min) {
     checkIsInMulti();
     client.zrevrangeByScoreWithScores(key, max, min);
-	Set<Tuple> set = getBinaryTupledSet();
-	return set;
+    return getBinaryTupledSet();
     }
 
     public Set<Tuple> zrevrangeByScoreWithScores(final byte[] key,
@@ -2570,8 +2548,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
         final int count) {
     checkIsInMulti();
     client.zrevrangeByScoreWithScores(key, max, min, offset, count);
-	Set<Tuple> set = getBinaryTupledSet();
-	return set;
+    return getBinaryTupledSet();
     }
 
     /**
@@ -2626,10 +2603,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * input keys N, before passing the input keys and the other (optional)
      * arguments.
      * <p>
-     * As the terms imply, the {@link #zinterstore(String, String...)
+     * As the terms imply, the {@link #zinterstore(byte[], byte[]...)}
      * ZINTERSTORE} command requires an element to be present in each of the
      * given inputs to be inserted in the result. The
-     * {@link #zunionstore(String, String...) ZUNIONSTORE} command inserts all
+     * {@link #zunionstore(byte[], byte[]...)}} command inserts all
      * elements across all inputs.
      * <p>
      * Using the WEIGHTS option, it is possible to add weight to each input
@@ -2648,10 +2625,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * sizes of the input sorted sets, and M being the number of elements in the
      * resulting sorted set
      * 
-     * @see #zunionstore(String, String...)
-     * @see #zunionstore(String, ZParams, String...)
-     * @see #zinterstore(String, String...)
-     * @see #zinterstore(String, ZParams, String...)
+     * @see #zunionstore(byte[], byte[]...)
+     * @see #zunionstore(byte[], ZParams, byte[]...)
+     * @see #zinterstore(byte[], byte[]...)
+     * @see #zinterstore(byte[], ZParams, byte[]...)
      * 
      * @param dstkey
      * @param sets
@@ -2670,10 +2647,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * input keys N, before passing the input keys and the other (optional)
      * arguments.
      * <p>
-     * As the terms imply, the {@link #zinterstore(String, String...)
+     * As the terms imply, the {@link #zinterstore(byte[], byte[]...)
      * ZINTERSTORE} command requires an element to be present in each of the
      * given inputs to be inserted in the result. The
-     * {@link #zunionstore(String, String...) ZUNIONSTORE} command inserts all
+     * {@link #zunionstore(byte[], byte[]...) ZUNIONSTORE} command inserts all
      * elements across all inputs.
      * <p>
      * Using the WEIGHTS option, it is possible to add weight to each input
@@ -2692,10 +2669,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * sizes of the input sorted sets, and M being the number of elements in the
      * resulting sorted set
      * 
-     * @see #zunionstore(String, String...)
-     * @see #zunionstore(String, ZParams, String...)
-     * @see #zinterstore(String, String...)
-     * @see #zinterstore(String, ZParams, String...)
+     * @see #zunionstore(byte[], byte[]...)
+     * @see #zunionstore(byte[], ZParams, byte[]...)
+     * @see #zinterstore(byte[], byte[]...)
+     * @see #zinterstore(byte[], ZParams, byte[]...)
      * 
      * @param dstkey
      * @param sets
@@ -2716,10 +2693,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * input keys N, before passing the input keys and the other (optional)
      * arguments.
      * <p>
-     * As the terms imply, the {@link #zinterstore(String, String...)
+     * As the terms imply, the {@link #zinterstore(byte[], byte[]...)
      * ZINTERSTORE} command requires an element to be present in each of the
      * given inputs to be inserted in the result. The
-     * {@link #zunionstore(String, String...) ZUNIONSTORE} command inserts all
+     * {@link #zunionstore(byte[], byte[]...) ZUNIONSTORE} command inserts all
      * elements across all inputs.
      * <p>
      * Using the WEIGHTS option, it is possible to add weight to each input
@@ -2738,10 +2715,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * sizes of the input sorted sets, and M being the number of elements in the
      * resulting sorted set
      * 
-     * @see #zunionstore(String, String...)
-     * @see #zunionstore(String, ZParams, String...)
-     * @see #zinterstore(String, String...)
-     * @see #zinterstore(String, ZParams, String...)
+     * @see #zunionstore(byte[], byte[]...)
+     * @see #zunionstore(byte[], ZParams, byte[]...)
+     * @see #zinterstore(byte[], byte[]...)
+     * @see #zinterstore(byte[], ZParams, byte[]...)
      * 
      * @param dstkey
      * @param sets
@@ -2760,10 +2737,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * input keys N, before passing the input keys and the other (optional)
      * arguments.
      * <p>
-     * As the terms imply, the {@link #zinterstore(String, String...)
+     * As the terms imply, the {@link #zinterstore(byte[], byte[]...)
      * ZINTERSTORE} command requires an element to be present in each of the
      * given inputs to be inserted in the result. The
-     * {@link #zunionstore(String, String...) ZUNIONSTORE} command inserts all
+     * {@link #zunionstore(byte[], byte[]...) ZUNIONSTORE} command inserts all
      * elements across all inputs.
      * <p>
      * Using the WEIGHTS option, it is possible to add weight to each input
@@ -2782,10 +2759,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * sizes of the input sorted sets, and M being the number of elements in the
      * resulting sorted set
      * 
-     * @see #zunionstore(String, String...)
-     * @see #zunionstore(String, ZParams, String...)
-     * @see #zinterstore(String, String...)
-     * @see #zinterstore(String, ZParams, String...)
+     * @see #zunionstore(byte[], byte[]...)
+     * @see #zunionstore(byte[], ZParams, byte[]...)
+     * @see #zinterstore(byte[], byte[]...)
+     * @see #zinterstore(byte[], ZParams, byte[]...)
      * 
      * @param dstkey
      * @param sets
@@ -2935,7 +2912,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      */
     public String shutdown() {
     client.shutdown();
-	String status = null;
+    String status;
     try {
         status = client.getStatusCodeReply();
     } catch (JedisException ex) {
@@ -3101,7 +3078,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * configuration parameters are supported.
      * <p>
      * The list of configuration parameters supported by CONFIG SET can be
-     * obtained issuing a {@link #configGet(String) CONFIG GET *} command.
+     * obtained issuing a {@link #configGet(byte[]) CONFIG GET *} command.
      * <p>
      * The configuration set using CONFIG SET is immediately loaded by the Redis
      * server that will start acting as specified starting from the next
@@ -3205,9 +3182,11 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     public byte[] brpoplpush(byte[] source, byte[] destination, int timeout) {
     client.brpoplpush(source, destination, timeout);
     client.setTimeoutInfinite();
-	byte[] reply = client.getBinaryBulkReply();
+    try {
+        return client.getBinaryBulkReply();
+    } finally {
         client.rollbackTimeout();
-	return reply;
+    }
     }
 
     /**
@@ -3267,15 +3246,21 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 
     public void subscribe(BinaryJedisPubSub jedisPubSub, byte[]... channels) {
     client.setTimeoutInfinite();
+    try {
         jedisPubSub.proceed(client, channels);
+    } finally {
         client.rollbackTimeout();
     }
+    }
 
     public void psubscribe(BinaryJedisPubSub jedisPubSub, byte[]... patterns) {
     client.setTimeoutInfinite();
+    try {
         jedisPubSub.proceedWithPatterns(client, patterns);
+    } finally {
         client.rollbackTimeout();
     }
+    }
 
     public Long getDB() {
     return client.getDB();
@@ -3289,15 +3274,13 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
      * @return Script result
      */
     public Object eval(byte[] script, List<byte[]> keys, List<byte[]> args) {
-	client.setTimeoutInfinite();
-	client.eval(script, toByteArray(keys.size()), getParams(keys, args));
-	return client.getOne();
+    return eval(script, toByteArray(keys.size()), getParams(keys, args));
     }
 
     private byte[][] getParams(List<byte[]> keys, List<byte[]> args) {
-	int keyCount = keys.size();
-	int argCount = args.size();
-	byte[][] params = new byte[keyCount + args.size()][];
+    final int keyCount = keys.size();
+    final int argCount = args.size();
+    byte[][] params = new byte[keyCount + argCount][];
 
     for (int i = 0; i < keyCount; i++)
         params[i] = keys.get(i);
@@ -3310,49 +3293,38 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 
     public Object eval(byte[] script, byte[] keyCount, byte[]... params) {
     client.setTimeoutInfinite();
+    try {
         client.eval(script, keyCount, params);
         return client.getOne();
+    } finally {
+        client.rollbackTimeout();
+    }
     }
 
     public Object eval(byte[] script, int keyCount, byte[]... params) {
-	client.setTimeoutInfinite();
-	client.eval(script, SafeEncoder.encode(Integer.toString(keyCount)),
-		params);
-	return client.getOne();
+    return eval(script, toByteArray(keyCount), params);
     }
 
     public Object eval(byte[] script) {
-	client.setTimeoutInfinite();
-	client.eval(script, 0);
-	return client.getOne();
+    return eval(script, 0);
     }
 
     public Object evalsha(byte[] sha1) {
-	client.setTimeoutInfinite();
-	client.evalsha(sha1, 0);
-	return client.getOne();
+    return evalsha(sha1, 1);
     }
 
     public Object evalsha(byte[] sha1, List<byte[]> keys, List<byte[]> args) {
-
-	int keyCount = keys == null ? 0 : keys.size();
-	int argCount = args == null ? 0 : args.size();
-
-	byte[][] params = new byte[keyCount + argCount][];
-
-	for (int i = 0; i < keyCount; i++)
-	    params[i] = keys.get(i);
-
-	for (int i = 0; i < argCount; i++)
-	    params[keyCount + i] = args.get(i);
-
-	return evalsha(sha1, keyCount, params);
+    return evalsha(sha1, keys.size(), getParams(keys, args));
     }
 
     public Object evalsha(byte[] sha1, int keyCount, byte[]... params) {
     client.setTimeoutInfinite();
+    try {
         client.evalsha(sha1, keyCount, params);
         return client.getOne();
+    } finally {
+        client.rollbackTimeout();
+    }
     }
 
     public String scriptFlush() {

src/main/java/redis/clients/jedis/BinaryJedisCommands.java

@@ -219,8 +219,18 @@ public interface BinaryJedisCommands {
 
     Long rpushx(byte[] key, byte[]... arg);
 
+
+    /**
+     * @deprecated unusable command, this command will be removed in 3.0.0.
+     */
+    @Deprecated
     List<byte[]> blpop(byte[] arg);
 
+
+    /**
+     * @deprecated unusable command, this command will be removed in 3.0.0.
+     */
+    @Deprecated
     List<byte[]> brpop(byte[] arg);
 
     Long del(byte[] key);

src/main/java/redis/clients/jedis/BinaryJedisPubSub.java

@@ -16,18 +16,17 @@ public abstract class BinaryJedisPubSub {
     private int subscribedChannels = 0;
     private Client client;
 
-    public abstract void onMessage(byte[] channel, byte[] message);
+    public void onMessage(byte[] channel, byte[] message) {}
 
-    public abstract void onPMessage(byte[] pattern, byte[] channel,
-	    byte[] message);
+    public void onPMessage(byte[] pattern, byte[] channel, byte[] message) {}
 
-    public abstract void onSubscribe(byte[] channel, int subscribedChannels);
+    public void onSubscribe(byte[] channel, int subscribedChannels) {}
 
-    public abstract void onUnsubscribe(byte[] channel, int subscribedChannels);
+    public void onUnsubscribe(byte[] channel, int subscribedChannels) {}
 
-    public abstract void onPUnsubscribe(byte[] pattern, int subscribedChannels);
+    public void onPUnsubscribe(byte[] pattern, int subscribedChannels) {}
 
-    public abstract void onPSubscribe(byte[] pattern, int subscribedChannels);
+    public void onPSubscribe(byte[] pattern, int subscribedChannels) {}
 
     public void unsubscribe() {
     client.unsubscribe();

src/main/java/redis/clients/jedis/Connection.java

@@ -1,5 +1,12 @@
 package redis.clients.jedis;
 
+import redis.clients.jedis.Protocol.Command;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.util.RedisInputStream;
+import redis.clients.util.RedisOutputStream;
+import redis.clients.util.SafeEncoder;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -8,13 +15,6 @@ import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.List;
 
-import redis.clients.jedis.Protocol.Command;
-import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.exceptions.JedisDataException;
-import redis.clients.util.RedisInputStream;
-import redis.clients.util.RedisOutputStream;
-import redis.clients.util.SafeEncoder;
-
 public class Connection implements Closeable {
 
     private String host = Protocol.DEFAULT_HOST;
@@ -54,7 +54,6 @@ public class Connection implements Closeable {
         if (!isConnected()) {
         connect();
         }
-	    socket.setKeepAlive(true);
         socket.setSoTimeout(0);
     } catch (SocketException ex) {
         broken = true;
@@ -65,7 +64,6 @@ public class Connection implements Closeable {
     public void rollbackTimeout() {
     try {
         socket.setSoTimeout(timeout);
-	    socket.setKeepAlive(false);
     } catch (SocketException ex) {
         broken = true;
         throw new JedisConnectionException(ex);
@@ -172,7 +170,7 @@ public class Connection implements Closeable {
         && !socket.isOutputShutdown();
     }
 
-    protected String getStatusCodeReply() {
+    public String getStatusCodeReply() {
     flush();
     final byte[] resp = (byte[]) readProtocolWithCheckingBroken();
     if (null == resp) {
@@ -254,9 +252,9 @@ public class Connection implements Closeable {
     }
     }
 
-    public List<Object> getMany(int count) {
+    public List<Object> getMany(final int count) {
     flush();
-	List<Object> responses = new ArrayList<Object>();
+    final List<Object> responses = new ArrayList<Object>(count);
     for (int i = 0; i < count; i++) {
         try {
         responses.add(readProtocolWithCheckingBroken());

src/main/java/redis/clients/jedis/Jedis.java

@@ -19,7 +19,7 @@ import redis.clients.util.Slowlog;
 
 public class Jedis extends BinaryJedis implements JedisCommands,
     MultiKeyCommands, AdvancedJedisCommands, ScriptingCommands,
-	BasicCommands, ClusterCommands {
+    BasicCommands, ClusterCommands, SentinelCommands {
 
     protected Pool<Jedis> dataSource = null;
 
@@ -1849,54 +1849,56 @@ public class Jedis extends BinaryJedis implements JedisCommands,
      *         programming language used.
      */
     public List<String> blpop(final int timeout, final String... keys) {
-	checkIsInMulti();
-	List<String> args = new ArrayList<String>();
-	for (String arg : keys) {
-	    args.add(arg);
+    return blpop(getArgsAddTimeout(timeout, keys));
     }
-	args.add(String.valueOf(timeout));
 
-	client.blpop(args.toArray(new String[args.size()]));
-	client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    private String[] getArgsAddTimeout (int timeout, String[] keys) {
+    final int keyCount = keys.length;
+    final String[] args = new String[keyCount + 1];
+    for (int at = 0; at != keyCount; ++at) {
+        args[at] = keys[at];
+    }
+
+    args[keyCount] = String.valueOf(timeout);
+    return args;
     }
 
     public List<String> blpop(String... args) {
+    checkIsInMulti();
     client.blpop(args);
     client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
+    try {
+        return client.getMultiBulkReply();
+    } finally {
         client.rollbackTimeout();
-	return multiBulkReply;
+    }
     }
 
     public List<String> brpop(String... args) {
+    checkIsInMulti();
     client.brpop(args);
     client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
+    try {
+        return client.getMultiBulkReply();
+    } finally {
         client.rollbackTimeout();
-	return multiBulkReply;
+    }
     }
 
+    /**
+     * @deprecated unusable command, this command will be removed in 3.0.0.
+     */
+    @Deprecated
     public List<String> blpop(String arg) {
-	String[] args = new String[1];
-	args[0] = arg;
-	client.blpop(args);
-	client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    return blpop(new String[]{arg});
     }
 
+    /**
+     * @deprecated unusable command, this command will be removed in 3.0.0.
+     */
+    @Deprecated
     public List<String> brpop(String arg) {
-	String[] args = new String[1];
-	args[0] = arg;
-	client.brpop(args);
-	client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    return brpop(new String[]{arg});
     }
 
     /**
@@ -2014,19 +2016,7 @@ public class Jedis extends BinaryJedis implements JedisCommands,
      *         programming language used.
      */
     public List<String> brpop(final int timeout, final String... keys) {
-	checkIsInMulti();
-	List<String> args = new ArrayList<String>();
-	for (String arg : keys) {
-	    args.add(arg);
-	}
-	args.add(String.valueOf(timeout));
-
-	client.brpop(args.toArray(new String[args.size()]));
-	client.setTimeoutInfinite();
-	List<String> multiBulkReply = client.getMultiBulkReply();
-	client.rollbackTimeout();
-
-	return multiBulkReply;
+    return brpop(getArgsAddTimeout(timeout, keys));
     }
 
     public Long zcount(final String key, final double min, final double max) {
@@ -2730,9 +2720,11 @@ public class Jedis extends BinaryJedis implements JedisCommands,
     public String brpoplpush(String source, String destination, int timeout) {
     client.brpoplpush(source, destination, timeout);
     client.setTimeoutInfinite();
-	String reply = client.getBulkReply();
+    try {
+        return client.getBulkReply();
+    } finally {
         client.rollbackTimeout();
-	return reply;
+    }
     }
 
     /**
@@ -2867,17 +2859,23 @@ public class Jedis extends BinaryJedis implements JedisCommands,
 
     public Object eval(String script, int keyCount, String... params) {
     client.setTimeoutInfinite();
+    try {
         client.eval(script, keyCount, params);
-
         return getEvalResult();
+    } finally {
+        client.rollbackTimeout();
+    }
     }
 
     public void subscribe(final JedisPubSub jedisPubSub,
         final String... channels) {
     client.setTimeoutInfinite();
+    try {
         jedisPubSub.proceed(client, channels);
+    } finally {
         client.rollbackTimeout();
     }
+    }
 
     public Long publish(final String channel, final String message) {
     checkIsInMulti();
@@ -2889,11 +2887,13 @@ public class Jedis extends BinaryJedis implements JedisCommands,
     public void psubscribe(final JedisPubSub jedisPubSub,
         final String... patterns) {
     checkIsInMulti();
-	connect();
     client.setTimeoutInfinite();
+    try {
         jedisPubSub.proceedWithPatterns(client, patterns);
+    } finally {
         client.rollbackTimeout();
     }
+    }
 
     protected static String[] getParams(List<String> keys, List<String> args) {
     int keyCount = keys.size();
@@ -2950,7 +2950,6 @@ public class Jedis extends BinaryJedis implements JedisCommands,
     public Object evalsha(String sha1, int keyCount, String... params) {
     checkIsInMulti();
     client.evalsha(sha1, keyCount, params);
-
     return getEvalResult();
     }
 
@@ -3509,28 +3508,12 @@ public class Jedis extends BinaryJedis implements JedisCommands,
 
     @Override
     public List<String> blpop(int timeout, String key) {
-	checkIsInMulti();
-	List<String> args = new ArrayList<String>();
-	args.add(key);
-	args.add(String.valueOf(timeout));
-	client.blpop(args.toArray(new String[args.size()]));
-	client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    return blpop(key, String.valueOf(timeout));
     }
 
     @Override
     public List<String> brpop(int timeout, String key) {
-	checkIsInMulti();
-	List<String> args = new ArrayList<String>();
-	args.add(key);
-	args.add(String.valueOf(timeout));
-	client.brpop(args.toArray(new String[args.size()]));
-	client.setTimeoutInfinite();
-	final List<String> multiBulkReply = client.getMultiBulkReply();
-	client.rollbackTimeout();
-	return multiBulkReply;
+    return brpop(key, String.valueOf(timeout));
     }
 
 }

src/main/java/redis/clients/jedis/JedisCluster.java

@@ -293,6 +293,17 @@ public class JedisCluster implements JedisCommands, BasicCommands, Closeable {
     }.run(key);
     }
 
+    @Override
+    public Double incrByFloat(final String key, final double value) {
+    return new JedisClusterCommand<Double>(connectionHandler, timeout,
+        maxRedirections) {
+        @Override
+        public Double execute(Jedis connection) {
+        return connection.incrByFloat(key, value);
+        }
+    }.run(key);
+    }
+
     @Override
     public Long incr(final String key) {
     return new JedisClusterCommand<Long>(connectionHandler, timeout,

src/main/java/redis/clients/jedis/JedisCommands.java

@@ -48,6 +48,8 @@ public interface JedisCommands {
 
     Long incrBy(String key, long integer);
 
+    Double incrByFloat(String key, double value);
+
     Long incr(String key);
 
     Long append(String key, String value);
@@ -216,10 +218,18 @@ public interface JedisCommands {
 
     Long rpushx(String key, String... string);
 
+    /**
+     * @deprecated unusable command, this will be removed in 3.0.0.
+     */
+    @Deprecated
     List<String> blpop(String arg);
 
     List<String> blpop(int timeout, String key);
 
+    /**
+     * @deprecated unusable command, this will be removed in 3.0.0.
+     */
+    @Deprecated
     List<String> brpop(String arg);
 
     List<String> brpop(int timeout, String key);

src/main/java/redis/clients/jedis/JedisPool.java

@@ -5,6 +5,7 @@ import java.net.URI;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 
+import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.util.JedisURIHelper;
 import redis.clients.util.Pool;
 
@@ -113,9 +114,16 @@ public class JedisPool extends Pool<Jedis> {
 
     public void returnResource(final Jedis resource) {
     if (resource != null) {
+        try {
             resource.resetState();
             returnResourceObject(resource);
         }
+        catch (Exception e) {
+            returnBrokenResource(resource);
+            throw new JedisException(
+                    "Could not return the resource to the pool", e);
+        }
+    }
     }
 
     public int getNumActive() {

src/main/java/redis/clients/jedis/JedisPubSub.java

@@ -18,18 +18,17 @@ public abstract class JedisPubSub {
     private int subscribedChannels = 0;
     private volatile Client client;
 
-    public abstract void onMessage(String channel, String message);
+    public void onMessage(String channel, String message) {}
 
-    public abstract void onPMessage(String pattern, String channel,
-	    String message);
+    public void onPMessage(String pattern, String channel, String message) {}
 
-    public abstract void onSubscribe(String channel, int subscribedChannels);
+    public void onSubscribe(String channel, int subscribedChannels) {}
 
-    public abstract void onUnsubscribe(String channel, int subscribedChannels);
+    public void onUnsubscribe(String channel, int subscribedChannels) {}
 
-    public abstract void onPUnsubscribe(String pattern, int subscribedChannels);
+    public void onPUnsubscribe(String pattern, int subscribedChannels) {}
 
-    public abstract void onPSubscribe(String pattern, int subscribedChannels);
+    public void onPSubscribe(String pattern, int subscribedChannels) {}
 
     public void unsubscribe() {
     if (client == null) {

src/main/java/redis/clients/jedis/JedisSentinelPool.java

@@ -222,32 +222,6 @@ public class JedisSentinelPool extends Pool<Jedis> {
     }
     }
 
-    protected class JedisPubSubAdapter extends JedisPubSub {
-	@Override
-	public void onMessage(String channel, String message) {
-	}
-
-	@Override
-	public void onPMessage(String pattern, String channel, String message) {
-	}
-
-	@Override
-	public void onPSubscribe(String pattern, int subscribedChannels) {
-	}
-
-	@Override
-	public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	}
-
-	@Override
-	public void onSubscribe(String channel, int subscribedChannels) {
-	}
-
-	@Override
-	public void onUnsubscribe(String channel, int subscribedChannels) {
-	}
-    }
-
     protected class MasterListener extends Thread {
 
     protected String masterName;
@@ -281,7 +255,7 @@ public class JedisSentinelPool extends Pool<Jedis> {
         j = new Jedis(host, port);
 
         try {
-		    j.subscribe(new JedisPubSubAdapter() {
+            j.subscribe(new JedisPubSub() {
             @Override
             public void onMessage(String channel, String message) {
                 log.fine("Sentinel " + host + ":" + port

src/main/java/redis/clients/jedis/Protocol.java

@@ -128,67 +128,61 @@ public final class Protocol {
     }
 
     private static Object process(final RedisInputStream is) {
-	try {
-	    byte b = is.readByte();
-	    if (b == MINUS_BYTE) {
-		processError(is);
+
+    final byte b = is.readByte();
+    if (b == PLUS_BYTE) {
+        return processStatusCodeReply(is);
+    } else if (b == DOLLAR_BYTE) {
+        return processBulkReply(is);
     } else if (b == ASTERISK_BYTE) {
         return processMultiBulkReply(is);
     } else if (b == COLON_BYTE) {
         return processInteger(is);
-	    } else if (b == DOLLAR_BYTE) {
-		return processBulkReply(is);
-	    } else if (b == PLUS_BYTE) {
-		return processStatusCodeReply(is);
+    } else  if (b == MINUS_BYTE) {
+        processError(is);
+        return null;
     } else {
         throw new JedisConnectionException("Unknown reply: " + (char) b);
     }
-	} catch (IOException e) {
-	    throw new JedisConnectionException(e);
-	}
-	return null;
     }
 
     private static byte[] processStatusCodeReply(final RedisInputStream is) {
-	return SafeEncoder.encode(is.readLine());
+    return is.readLineBytes();
     }
 
     private static byte[] processBulkReply(final RedisInputStream is) {
-	int len = Integer.parseInt(is.readLine());
+    final int len = is.readIntCrLf();
     if (len == -1) {
         return null;
     }
-	byte[] read = new byte[len];
+
+    final byte[] read = new byte[len];
     int offset = 0;
-	try {
     while (offset < len) {
-		int size = is.read(read, offset, (len - offset));
+        final int size = is.read(read, offset, (len - offset));
         if (size == -1)
         throw new JedisConnectionException(
             "It seems like server has closed the connection.");
         offset += size;
     }
+
     // read 2 more bytes for the command delimiter
     is.readByte();
     is.readByte();
-	} catch (IOException e) {
-	    throw new JedisConnectionException(e);
-	}
 
     return read;
     }
 
     private static Long processInteger(final RedisInputStream is) {
-	String num = is.readLine();
-	return Long.valueOf(num);
+    return is.readLongCrLf();
     }
 
     private static List<Object> processMultiBulkReply(final RedisInputStream is) {
-	int num = Integer.parseInt(is.readLine());
+    final int num = is.readIntCrLf();
     if (num == -1) {
         return null;
     }
-	List<Object> ret = new ArrayList<Object>(num);
+    final List<Object> ret = new ArrayList<Object>(num);
     for (int i = 0; i < num; i++) {
         try {
         ret.add(process(is));

src/main/java/redis/clients/util/RedisInputStream.java

@@ -16,12 +16,15 @@
 
 package redis.clients.util;
 
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
+/**
+ * This class assumes (to some degree) that we are reading a RESP stream. As such it assumes
+ * certain conventions regarding CRLF line termination. It also assumes that if the Protocol
+ * layer requires a byte that if that byte is not there it is a stream error.
+ */
 public class RedisInputStream extends FilterInputStream {
 
     protected final byte buf[];
@@ -40,39 +43,21 @@ public class RedisInputStream extends FilterInputStream {
     this(in, 8192);
     }
 
-    public byte readByte() throws IOException {
-	if (count == limit) {
-	    fill();
-	}
-
+    public byte readByte() throws JedisConnectionException {
+    ensureFill();
     return buf[count++];
     }
 
     public String readLine() {
-	int b;
-	byte c;
-	StringBuilder sb = new StringBuilder();
-
-	try {
+    final StringBuilder sb = new StringBuilder();
     while (true) {
-		if (count == limit) {
-		    fill();
-		}
-		if (limit == -1)
-		    break;
+        ensureFill();
 
-		b = buf[count++];
+        byte b = buf[count++];
         if (b == '\r') {
-		    if (count == limit) {
-			fill();
-		    }
+        ensureFill(); // Must be one more byte
 
-		    if (limit == -1) {
-			sb.append((char) b);
-			break;
-		    }
-
-		    c = buf[count++];
+        byte c = buf[count++];
         if (c == '\n') {
             break;
         }
@@ -82,31 +67,148 @@ public class RedisInputStream extends FilterInputStream {
         sb.append((char) b);
         }
     }
-	} catch (IOException e) {
-	    throw new JedisConnectionException(e);
-	}
-	String reply = sb.toString();
+
+    final String reply = sb.toString();
     if (reply.length() == 0) {
-	    throw new JedisConnectionException(
-		    "It seems like server has closed the connection.");
+        throw new JedisConnectionException("It seems like server has closed the connection.");
     }
+
     return reply;
     }
 
-    public int read(byte[] b, int off, int len) throws IOException {
-	if (count == limit) {
-	    fill();
-	    if (limit == -1)
-		return -1;
+    public byte[] readLineBytes() {
+
+    /* This operation should only require one fill. In that typical
+    case we optimize allocation and copy of the byte array. In the
+    edge case where more than one fill is required then we take a
+    slower path and expand a byte array output stream as is
+    necessary. */
+
+    ensureFill();
+
+    int pos = count;
+    final byte[] buf = this.buf;
+    while (true) {
+        if (pos == limit) {
+        return readLineBytesSlowly();
         }
+
+        if (buf[pos++] == '\r') {
+        if (pos == limit) {
+            return readLineBytesSlowly();
+        }
+
+        if (buf[pos++] == '\n') {
+            break;
+        }
+        }
+    }
+
+    final int N = (pos - count) - 2;
+    final byte[] line = new byte[N];
+    System.arraycopy(buf, count, line, 0, N);
+    count = pos;
+    return line;
+    }
+
+    /**
+     * Slow path in case a line of bytes cannot be read in one #fill() operation. This is still faster
+     * than creating the StrinbBuilder, String, then encoding as byte[] in Protocol, then decoding back
+     * into a String.
+     */
+    private byte[] readLineBytesSlowly() {
+    ByteArrayOutputStream bout = null;
+    while (true) {
+        ensureFill();
+
+        byte b = buf[count++];
+        if (b == '\r') {
+        ensureFill(); // Must be one more byte
+
+        byte c = buf[count++];
+        if (c == '\n') {
+            break;
+        }
+
+        if (bout == null) {
+            bout = new ByteArrayOutputStream(16);
+        }
+
+        bout.write(b);
+        bout.write(c);
+        } else {
+        if (bout == null) {
+            bout = new ByteArrayOutputStream(16);
+        }
+
+        bout.write(b);
+        }
+    }
+
+    return bout == null ? new byte[0] : bout.toByteArray();
+    }
+
+    public int readIntCrLf() {
+    return (int)readLongCrLf();
+    }
+
+    public long readLongCrLf() {
+    final byte[] buf = this.buf;
+
+    ensureFill();
+
+    final boolean isNeg = buf[count] == '-';
+    if (isNeg) {
+        ++count;
+    }
+
+    long value = 0;
+    while (true) {
+        ensureFill();
+
+        final int b = buf[count++];
+        if (b == '\r') {
+        ensureFill();
+
+        if (buf[count++] != '\n') {
+            throw new JedisConnectionException("Unexpected character!");
+        }
+
+        break;
+        }
+        else {
+        value = value * 10 + b - '0';
+        }
+    }
+
+    return (isNeg ? -value : value);
+    }
+
+    public int read(byte[] b, int off, int len) throws JedisConnectionException {
+    ensureFill();
+
     final int length = Math.min(limit - count, len);
     System.arraycopy(buf, count, b, off, length);
     count += length;
     return length;
     }
 
-    private void fill() throws IOException {
+    /**
+     * This methods assumes there are required bytes to be read. If we cannot read
+     * anymore bytes an exception is thrown to quickly ascertain that the stream
+     * was smaller than expected.
+     */
+    private void ensureFill() throws JedisConnectionException {
+    if (count >= limit) {
+        try {
         limit = in.read(buf);
         count = 0;
+        if (limit == -1) {
+            throw new JedisConnectionException("Unexpected end of stream.");
+        }
+        } catch (IOException e) {
+        throw new JedisConnectionException(e);
+        }
+    }
     }
 }

src/test/java/redis/clients/jedis/tests/JedisPoolTest.java

@@ -1,8 +1,13 @@
 package redis.clients.jedis.tests;
 
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.PooledObjectFactory;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.junit.Assert;
 import org.junit.Test;
@@ -206,6 +211,56 @@ public class JedisPoolTest extends Assert {
     assertTrue(pool0.isClosed());
     }
 
+    @Test
+    public void returnResourceDestroysResourceOnException() {
+
+    class CrashingJedis extends Jedis {
+        @Override
+        public void resetState() {
+        throw new RuntimeException();
+        }
+    }
+
+    final AtomicInteger destroyed = new AtomicInteger(0);
+
+    class CrashingJedisPooledObjectFactory implements PooledObjectFactory<Jedis> {
+
+        @Override
+        public PooledObject<Jedis> makeObject() throws Exception {
+        return new DefaultPooledObject<Jedis>(new CrashingJedis());
+        }
+
+        @Override
+        public void destroyObject(PooledObject<Jedis> p) throws Exception {
+        destroyed.incrementAndGet();
+        }
+
+        @Override
+        public boolean validateObject(PooledObject<Jedis> p) {
+        return true;
+        }
+
+        @Override
+        public void activateObject(PooledObject<Jedis> p) throws Exception {}
+
+        @Override
+        public void passivateObject(PooledObject<Jedis> p) throws Exception {}
+    }
+
+    GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+    config.setMaxTotal(1);
+    JedisPool pool = new JedisPool(config, hnp.getHost(), hnp.getPort(), 2000, "foobared");
+    pool.initPool(config, new CrashingJedisPooledObjectFactory());
+    Jedis crashingJedis = pool.getResource();
+
+    try {
+        pool.returnResource(crashingJedis);
+    }
+    catch (Exception ignored) {}
+
+    assertEquals(destroyed.get(), 1);
+    }
+
     @Test
     public void returnResourceShouldResetState() {
     GenericObjectPoolConfig config = new GenericObjectPoolConfig();

src/test/java/redis/clients/jedis/tests/benchmark/ProtocolBenchmark.java

@@ -0,0 +1,105 @@
+package redis.clients.jedis.tests.benchmark;
+
+import redis.clients.jedis.Protocol;
+import redis.clients.util.RedisInputStream;
+import redis.clients.util.RedisOutputStream;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Copyright (c) 2014
+ */
+public class ProtocolBenchmark {
+    private static final int TOTAL_OPERATIONS = 500000;
+
+    public static void main(String[] args) throws Exception,
+    IOException {
+    long total = 0;
+    for (int at = 0; at != 10; ++at) {
+        long elapsed = measureInputMulti();
+        long ops = ((1000 * 2 * TOTAL_OPERATIONS) / TimeUnit.NANOSECONDS.toMillis(elapsed));
+        if (at >= 5) {
+        total += ops;
+        }
+    }
+    System.out.println((total / 5) + " avg");
+
+    total = 0;
+    for (int at = 0; at != 10; ++at) {
+        long elapsed = measureInputStatus();
+        long ops = ((1000 * 2 * TOTAL_OPERATIONS) / TimeUnit.NANOSECONDS.toMillis(elapsed));
+        if (at >= 5) {
+        total += ops;
+        }
+    }
+
+    System.out.println((total / 5) + " avg");
+
+    total = 0;
+    for (int at = 0; at != 10; ++at) {
+        long elapsed = measureCommand();
+        long ops = ((1000 * 2 * TOTAL_OPERATIONS) / TimeUnit.NANOSECONDS.toMillis(elapsed));
+        if (at >= 5) {
+        total += ops;
+        }
+    }
+
+    System.out.println((total / 5) + " avg");
+    }
+
+    private static long measureInputMulti() throws Exception {
+    long duration = 0;
+
+    InputStream is = new ByteArrayInputStream(
+        "*4\r\n$3\r\nfoo\r\n$13\r\nbarbarbarfooz\r\n$5\r\nHello\r\n$5\r\nWorld\r\n"
+        .getBytes());
+
+    RedisInputStream in = new RedisInputStream(is);
+    for (int n = 0; n <= TOTAL_OPERATIONS; n++) {
+        long start = System.nanoTime();
+        Protocol.read(in);
+        duration += (System.nanoTime() - start);
+        in.reset();
+    }
+
+    return duration;
+    }
+
+    private static long measureInputStatus() throws Exception {
+    long duration = 0;
+
+    InputStream is = new ByteArrayInputStream(
+        "+OK\r\n"
+        .getBytes());
+
+    RedisInputStream in = new RedisInputStream(is);
+    for (int n = 0; n <= TOTAL_OPERATIONS; n++) {
+        long start = System.nanoTime();
+        Protocol.read(in);
+        duration += (System.nanoTime() - start);
+        in.reset();
+    }
+
+    return duration;
+    }
+
+    private static long measureCommand() throws Exception {
+    long duration = 0;
+
+    byte[] KEY = "123456789".getBytes();
+    byte[] VAL = "FooBar".getBytes();
+
+    for (int n = 0; n <= TOTAL_OPERATIONS; n++) {
+        RedisOutputStream out = new RedisOutputStream(new ByteArrayOutputStream(8192));
+        long start = System.nanoTime();
+        Protocol.sendCommand(out, Protocol.Command.SET, KEY, VAL);
+        duration += (System.nanoTime() - start);
+    }
+
+    return duration;
+    }
+}

src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java

@@ -10,9 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
 
-import redis.clients.jedis.BinaryJedisPubSub;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPubSub;
+import redis.clients.jedis.*;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.util.SafeEncoder;
 
@@ -52,16 +50,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         assertEquals("foo", channel);
         assertEquals(0, subscribedChannels);
         }
-
-	    public void onPSubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    public void onPMessage(String pattern, String channel,
-		    String message) {
-	    }
     }, "foo");
     }
 
@@ -72,10 +60,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     jedis.subscribe(new JedisPubSub() {
         private int count = 0;
 
-	    @Override
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
         @Override
         public void onSubscribe(String channel, int subscribedChannels) {
         count++;
@@ -89,23 +73,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
             unsubscribe();
         }
         }
-
-	    @Override
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onPSubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onPMessage(String pattern, String channel,
-		    String message) {
-	    }
-
-	    @Override
-	    public void onMessage(String channel, String message) {
-	    }
     }, "testchan1", "testchan2", "testchan3");
     }
 
@@ -114,18 +81,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     jedis.psubscribe(new JedisPubSub() {
         private int count = 0;
 
-	    @Override
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onSubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
         @Override
         public void onPSubscribe(String pattern, int subscribedChannels) {
         count++;
@@ -137,14 +92,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         }
         }
 
-	    @Override
-	    public void onPMessage(String pattern, String channel,
-		    String message) {
-	    }
-
-	    @Override
-	    public void onMessage(String channel, String message) {
-	    }
     }, "test*", "test*", "chan*");
     }
 
@@ -156,10 +103,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     jedis.subscribe(new JedisPubSub() {
         private int count = 0;
 
-	    @Override
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
         @Override
         public void onSubscribe(String channel, int subscribedChannels) {
         count++;
@@ -171,23 +114,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
             unsubscribe();
         }
         }
-
-	    @Override
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onPSubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onPMessage(String pattern, String channel,
-		    String message) {
-	    }
-
-	    @Override
-	    public void onMessage(String channel, String message) {
-	    }
     }, "testchannel1", "testchannel2");
     }
 
@@ -203,18 +129,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         publishOne(channel, "exit");
         }
 
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    public void onPSubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    public void onPMessage(String pattern, String channel,
-		    String message) {
-	    }
     }, "foo", "bar");
     }
 
@@ -222,15 +136,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     public void psubscribe() throws UnknownHostException, IOException,
         InterruptedException {
     jedis.psubscribe(new JedisPubSub() {
-	    public void onMessage(String channel, String message) {
-	    }
-
-	    public void onSubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
         public void onPSubscribe(String pattern, int subscribedChannels) {
         assertEquals("foo.*", pattern);
         assertEquals(1, subscribedChannels);
@@ -257,22 +162,10 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     public void psubscribeMany() throws UnknownHostException, IOException,
         InterruptedException {
     jedis.psubscribe(new JedisPubSub() {
-	    public void onMessage(String channel, String message) {
-	    }
-
-	    public void onSubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
         public void onPSubscribe(String pattern, int subscribedChannels) {
         publishOne(pattern.replace("*", "123"), "exit");
         }
 
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
         public void onPMessage(String pattern, String channel,
             String message) {
         punsubscribe(pattern);
@@ -296,16 +189,10 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         }
         }
 
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
         public void onPSubscribe(String pattern, int subscribedChannels) {
         publishOne(pattern.replace("*", "123"), "exit");
         }
 
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
         public void onPMessage(String pattern, String channel,
             String message) {
         punsubscribe(pattern);
@@ -335,16 +222,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         assertTrue(Arrays.equals(SafeEncoder.encode("foo"), channel));
         assertEquals(0, subscribedChannels);
         }
-
-	    public void onPSubscribe(byte[] pattern, int subscribedChannels) {
-	    }
-
-	    public void onPUnsubscribe(byte[] pattern, int subscribedChannels) {
-	    }
-
-	    public void onPMessage(byte[] pattern, byte[] channel,
-		    byte[] message) {
-	    }
     }, SafeEncoder.encode("foo"));
     }
 
@@ -359,19 +236,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         public void onSubscribe(byte[] channel, int subscribedChannels) {
         publishOne(SafeEncoder.encode(channel), "exit");
         }
-
-	    public void onUnsubscribe(byte[] channel, int subscribedChannels) {
-	    }
-
-	    public void onPSubscribe(byte[] pattern, int subscribedChannels) {
-	    }
-
-	    public void onPUnsubscribe(byte[] pattern, int subscribedChannels) {
-	    }
-
-	    public void onPMessage(byte[] pattern, byte[] channel,
-		    byte[] message) {
-	    }
     }, SafeEncoder.encode("foo"), SafeEncoder.encode("bar"));
     }
 
@@ -379,15 +243,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     public void binaryPsubscribe() throws UnknownHostException, IOException,
         InterruptedException {
     jedis.psubscribe(new BinaryJedisPubSub() {
-	    public void onMessage(byte[] channel, byte[] message) {
-	    }
-
-	    public void onSubscribe(byte[] channel, int subscribedChannels) {
-	    }
-
-	    public void onUnsubscribe(byte[] channel, int subscribedChannels) {
-	    }
-
         public void onPSubscribe(byte[] pattern, int subscribedChannels) {
         assertTrue(Arrays.equals(SafeEncoder.encode("foo.*"), pattern));
         assertEquals(1, subscribedChannels);
@@ -415,23 +270,11 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     public void binaryPsubscribeMany() throws UnknownHostException,
         IOException, InterruptedException {
     jedis.psubscribe(new BinaryJedisPubSub() {
-	    public void onMessage(byte[] channel, byte[] message) {
-	    }
-
-	    public void onSubscribe(byte[] channel, int subscribedChannels) {
-	    }
-
-	    public void onUnsubscribe(byte[] channel, int subscribedChannels) {
-	    }
-
         public void onPSubscribe(byte[] pattern, int subscribedChannels) {
         publishOne(SafeEncoder.encode(pattern).replace("*", "123"),
             "exit");
         }
 
-	    public void onPUnsubscribe(byte[] pattern, int subscribedChannels) {
-	    }
-
         public void onPMessage(byte[] pattern, byte[] channel,
             byte[] message) {
         punsubscribe(pattern);
@@ -456,17 +299,11 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
         }
         }
 
-	    public void onUnsubscribe(byte[] channel, int subscribedChannels) {
-	    }
-
         public void onPSubscribe(byte[] pattern, int subscribedChannels) {
         publishOne(SafeEncoder.encode(pattern).replace("*", "123"),
             "exit");
         }
 
-	    public void onPUnsubscribe(byte[] pattern, int subscribedChannels) {
-	    }
-
         public void onPMessage(byte[] pattern, byte[] channel,
             byte[] message) {
         punsubscribe(pattern);
@@ -478,26 +315,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
 
     @Test(expected = JedisConnectionException.class)
     public void unsubscribeWhenNotSusbscribed() throws InterruptedException {
-	JedisPubSub pubsub = new JedisPubSub() {
-	    public void onMessage(String channel, String message) {
-	    }
-
-	    public void onPMessage(String pattern, String channel,
-		    String message) {
-	    }
-
-	    public void onSubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
-	    public void onPSubscribe(String pattern, int subscribedChannels) {
-	    }
-	};
+    JedisPubSub pubsub = new JedisPubSub() {};
     pubsub.unsubscribe();
     }
 
@@ -550,23 +368,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
             fail(e.getMessage());
             }
         }
-
-		public void onSubscribe(String channel, int subscribedChannels) {
-		}
-
-		public void onUnsubscribe(String channel, int subscribedChannels) {
-		}
-
-		public void onPSubscribe(String pattern, int subscribedChannels) {
-		}
-
-		public void onPUnsubscribe(String pattern,
-			int subscribedChannels) {
-		}
-
-		public void onPMessage(String pattern, String channel,
-			String message) {
-		}
         }, "foo");
     } finally {
         // exit the publisher thread. if exception is thrown, thread might

src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java

@@ -16,10 +16,6 @@ public class JedisSentinelTestUtil {
 
     sentinelJedis.psubscribe(new JedisPubSub() {
 
-	    @Override
-	    public void onMessage(String channel, String message) {
-	    }
-
         @Override
         public void onPMessage(String pattern, String channel,
             String message) {
@@ -34,18 +30,6 @@ public class JedisSentinelTestUtil {
         }
         }
 
-	    @Override
-	    public void onSubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onUnsubscribe(String channel, int subscribedChannels) {
-	    }
-
-	    @Override
-	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-	    }
-
         @Override
         public void onPSubscribe(String pattern, int subscribedChannels) {
         commandJedis.sentinelFailover(masterName);