Produced by Araxis Merge on Mon Mar 6 17:40:24 2006 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Mon Mar 6 17:40:24 2006 UTC | ||
| 2 | Mon Mar 6 17:40:24 2006 UTC | ||
| 3 | C:\Merge Test Files\4.1.24\catalina\src\share\org\apache\catalina\connector | ClientAbortException.java | Wed Mar 19 09:18:36 2003 UTC |
| Note: Merge considers the second file to be the common ancestor of the others. | |||
| Description | Between Files 1 and 2 |
Between Files 2 and 3 |
Relative to Common Ancestor |
|||
|---|---|---|---|---|---|---|
| Text Blocks | Lines | Text Blocks | Lines | Text Blocks | Lines | |
| Unchanged | 0 | 0 | 0 | 0 | ||
| Changed | 0 | 0 | 0 | 0 | 0 | 0 |
| Inserted | 0 | 0 | 1 | 191 | 1 | 191 |
| Removed | 0 | 0 | 0 | 0 | 0 | 0 |
| Note: An automatic merge would leave 0 conflict(s). | ||||||
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /* | |||||||||
| 2 | * $Header : /home/cv s/jakarta- tomcat-4.0 /catalina/ src/share/ org/apache /catalina/ connector/ ClientAbor tException .java,v 1. 1 2003/02/ 19 14:42:4 0 glenn Ex p $ | |||||||||
| 3 | * $Revisi on: 1.1 $ | |||||||||
| 4 | * $Date: 2003/02/19 14:42:40 $ | |||||||||
| 5 | * | |||||||||
| 6 | * ======= ========== ========== ========== ========== ========== ========== = | |||||||||
| 7 | * | |||||||||
| 8 | * The Apa che Softwa re License , Version 1.1 | |||||||||
| 9 | * | |||||||||
| 10 | * Copyrig ht (c) 199 9 The Apac he Softwar e Foundati on. All r ights | |||||||||
| 11 | * reserve d. | |||||||||
| 12 | * | |||||||||
| 13 | * Redistr ibution an d use in s ource and binary for ms, with o r without | |||||||||
| 14 | * modific ation, are permitted provided that the f ollowing c onditions | |||||||||
| 15 | * are met : | |||||||||
| 16 | * | |||||||||
| 17 | * 1. Redi stribution s of sourc e code mus t retain t he above c opyright | |||||||||
| 18 | * noti ce, this l ist of con ditions an d the foll owing disc laimer. | |||||||||
| 19 | * | |||||||||
| 20 | * 2. Redi stribution s in binar y form mus t reproduc e the abov e copyrigh t | |||||||||
| 21 | * noti ce, this l ist of con ditions an d the foll owing disc laimer in | |||||||||
| 22 | * the documentat ion and/or other mat erials pro vided with the | |||||||||
| 23 | * dist ribution. | |||||||||
| 24 | * | |||||||||
| 25 | * 3. The end-user d ocumentati on include d with the redistrib ution, if | |||||||||
| 26 | * any, must incl ude the fo llowing ac knowlegeme nt: | |||||||||
| 27 | * " This produ ct include s software developed by the | |||||||||
| 28 | * Apache Sof tware Foun dation (ht tp://www.a pache.org/ )." | |||||||||
| 29 | * Alte rnately, t his acknow legement m ay appear in the sof tware itse lf, | |||||||||
| 30 | * if a nd whereve r such thi rd-party a cknowlegem ents norma lly appear . | |||||||||
| 31 | * | |||||||||
| 32 | * 4. The names "The Jakarta P roject", " Tomcat", a nd "Apache Software | |||||||||
| 33 | * Foun dation" mu st not be used to en dorse or p romote pro ducts deri ved | |||||||||
| 34 | * from this soft ware witho ut prior w ritten per mission. F or written | |||||||||
| 35 | * perm ission, pl ease conta ct apache@ apache.org . | |||||||||
| 36 | * | |||||||||
| 37 | * 5. Prod ucts deriv ed from th is softwar e may not be called "Apache" | |||||||||
| 38 | * nor may "Apach e" appear in their n ames witho ut prior w ritten | |||||||||
| 39 | * perm ission of the Apache Group. | |||||||||
| 40 | * | |||||||||
| 41 | * THIS SO FTWARE IS PROVIDED ` `AS IS'' A ND ANY EXP RESSED OR IMPLIED | |||||||||
| 42 | * WARRANT IES, INCLU DING, BUT NOT LIMITE D TO, THE IMPLIED WA RRANTIES | |||||||||
| 43 | * OF MERC HANTABILIT Y AND FITN ESS FOR A PARTICULAR PURPOSE A RE | |||||||||
| 44 | * DISCLAI MED. IN N O EVENT SH ALL THE AP ACHE SOFTW ARE FOUNDA TION OR | |||||||||
| 45 | * ITS CON TRIBUTORS BE LIABLE FOR ANY DI RECT, INDI RECT, INCI DENTAL, | |||||||||
| 46 | * SPECIAL , EXEMPLAR Y, OR CONS EQUENTIAL DAMAGES (I NCLUDING, BUT NOT | |||||||||
| 47 | * LIMITED TO, PROCU REMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | |||||||||
| 48 | * USE, DA TA, OR PRO FITS; OR B USINESS IN TERRUPTION ) HOWEVER CAUSED AND | |||||||||
| 49 | * ON ANY THEORY OF LIABILITY, WHETHER I N CONTRACT , STRICT L IABILITY, | |||||||||
| 50 | * OR TORT (INCLUDIN G NEGLIGEN CE OR OTHE RWISE) ARI SING IN AN Y WAY OUT | |||||||||
| 51 | * OF THE USE OF THI S SOFTWARE , EVEN IF ADVISED OF THE POSSI BILITY OF | |||||||||
| 52 | * SUCH DA MAGE. | |||||||||
| 53 | * ======= ========== ========== ========== ========== ========== ========== = | |||||||||
| 54 | * | |||||||||
| 55 | * This so ftware con sists of v oluntary c ontributio ns made by many | |||||||||
| 56 | * individ uals on be half of th e Apache S oftware Fo undation. For more | |||||||||
| 57 | * informa tion on th e Apache S oftware Fo undation, please see | |||||||||
| 58 | * <http:/ /www.apach e.org/>. | |||||||||
| 59 | * | |||||||||
| 60 | * [Additi onal notic es, if req uired by p rior licen sing condi tions] | |||||||||
| 61 | * | |||||||||
| 62 | */ | |||||||||
| 63 | ||||||||||
| 64 | ||||||||||
| 65 | package or g.apache.c atalina.co nnector; | |||||||||
| 66 | ||||||||||
| 67 | import jav a.io.IOExc eption; | |||||||||
| 68 | ||||||||||
| 69 | /** | |||||||||
| 70 | * Wrap an IOExcepti on identif ying it as being cau sed by an abort | |||||||||
| 71 | * of a re quest by a remote cl ient. | |||||||||
| 72 | * | |||||||||
| 73 | * @author Glenn L. Nielsen | |||||||||
| 74 | * @versio n $Revisio n: 1.1 $ $ Date: 2003 /02/19 14: 42:40 $ | |||||||||
| 75 | */ | |||||||||
| 76 | ||||||||||
| 77 | public fin al class C lientAbort Exception extends IO Exception { | |||||||||
| 78 | ||||||||||
| 79 | ||||||||||
| 80 | //---- ---------- ---------- ---------- ---------- ---------- ------ Con structors | |||||||||
| 81 | ||||||||||
| 82 | ||||||||||
| 83 | /** | |||||||||
| 84 | * Con struct a n ew ClientA bortExcept ion with n o other in formation. | |||||||||
| 85 | */ | |||||||||
| 86 | public ClientAbo rtExceptio n() { | |||||||||
| 87 | ||||||||||
| 88 | th is(null, n ull); | |||||||||
| 89 | ||||||||||
| 90 | } | |||||||||
| 91 | ||||||||||
| 92 | ||||||||||
| 93 | /** | |||||||||
| 94 | * Con struct a n ew ClientA bortExcept ion for th e specifie d message. | |||||||||
| 95 | * | |||||||||
| 96 | * @pa ram messag e Message describing this exce ption | |||||||||
| 97 | */ | |||||||||
| 98 | public ClientAbo rtExceptio n(String m essage) { | |||||||||
| 99 | ||||||||||
| 100 | th is(message , null); | |||||||||
| 101 | ||||||||||
| 102 | } | |||||||||
| 103 | ||||||||||
| 104 | ||||||||||
| 105 | /** | |||||||||
| 106 | * Con struct a n ew ClientA bortExcept ion for th e specifie d throwabl e. | |||||||||
| 107 | * | |||||||||
| 108 | * @pa ram throwa ble Throwa ble that c aused this exception | |||||||||
| 109 | */ | |||||||||
| 110 | public ClientAbo rtExceptio n(Throwabl e throwabl e) { | |||||||||
| 111 | ||||||||||
| 112 | th is(null, t hrowable); | |||||||||
| 113 | ||||||||||
| 114 | } | |||||||||
| 115 | ||||||||||
| 116 | ||||||||||
| 117 | /** | |||||||||
| 118 | * Con struct a n ew ClientA bortExcept ion for th e specifie d message | |||||||||
| 119 | * and throwable . | |||||||||
| 120 | * | |||||||||
| 121 | * @pa ram messag e Message describing this exce ption | |||||||||
| 122 | * @pa ram throwa ble Throwa ble that c aused this exception | |||||||||
| 123 | */ | |||||||||
| 124 | public ClientAbo rtExceptio n(String m essage, Th rowable th rowable) { | |||||||||
| 125 | ||||||||||
| 126 | su per(); | |||||||||
| 127 | th is.message = message ; | |||||||||
| 128 | th is.throwab le = throw able; | |||||||||
| 129 | ||||||||||
| 130 | } | |||||||||
| 131 | ||||||||||
| 132 | ||||||||||
| 133 | //---- ---------- ---------- ---------- ---------- ---------- Instance Variables | |||||||||
| 134 | ||||||||||
| 135 | ||||||||||
| 136 | /** | |||||||||
| 137 | * The error mes sage passe d to our c onstructor (if any) | |||||||||
| 138 | */ | |||||||||
| 139 | protec ted String message = null; | |||||||||
| 140 | ||||||||||
| 141 | ||||||||||
| 142 | /** | |||||||||
| 143 | * The underlyin g exceptio n or error passed to our const ructor (if any) | |||||||||
| 144 | */ | |||||||||
| 145 | protec ted Throwa ble throwa ble = null ; | |||||||||
| 146 | ||||||||||
| 147 | ||||||||||
| 148 | //---- ---------- ---------- ---------- ---------- ---------- ---- Publi c Methods | |||||||||
| 149 | ||||||||||
| 150 | ||||||||||
| 151 | /** | |||||||||
| 152 | * Ret urns the m essage ass ociated wi th this ex ception, i f any. | |||||||||
| 153 | */ | |||||||||
| 154 | public String ge tMessage() { | |||||||||
| 155 | ||||||||||
| 156 | re turn (mess age); | |||||||||
| 157 | ||||||||||
| 158 | } | |||||||||
| 159 | ||||||||||
| 160 | ||||||||||
| 161 | /** | |||||||||
| 162 | * Ret urns the t hrowable t hat caused this exce ption, if any. | |||||||||
| 163 | */ | |||||||||
| 164 | public Throwable getThrowa ble() { | |||||||||
| 165 | ||||||||||
| 166 | re turn (thro wable); | |||||||||
| 167 | ||||||||||
| 168 | } | |||||||||
| 169 | ||||||||||
| 170 | ||||||||||
| 171 | /** | |||||||||
| 172 | * Ret urn a form atted stri ng that de scribes th is excepti on. | |||||||||
| 173 | */ | |||||||||
| 174 | public String to String() { | |||||||||
| 175 | ||||||||||
| 176 | St ringBuffer sb = new StringBuff er("Client AbortExcep tion: "); | |||||||||
| 177 | if (message != null) { | |||||||||
| 178 | sb.appen d(message) ; | |||||||||
| 179 | if (thro wable != n ull) { | |||||||||
| 180 | sb.a ppend(": "); | |||||||||
| 181 | } | |||||||||
| 182 | } | |||||||||
| 183 | if (throwabl e != null) { | |||||||||
| 184 | sb.appen d(throwabl e.toString ()); | |||||||||
| 185 | } | |||||||||
| 186 | re turn (sb.t oString()) ; | |||||||||
| 187 | ||||||||||
| 188 | } | |||||||||
| 189 | ||||||||||
| 190 | ||||||||||
| 191 | } | |||||||||
Araxis Merge (but not this generated report) is Copyright © 1993-2005 Araxis Ltd (www.araxis.com). All rights reserved.