Wed, 05 Jul 2017 17:55:40 +0200 Added tag jdk8-b14 for changeset 9ffaa48dbfb0
duke [Wed, 05 Jul 2017 17:55:40 +0200] rev 10959
Added tag jdk8-b14 for changeset 9ffaa48dbfb0
Wed, 05 Jul 2017 17:55:40 +0200 Merge jdk8-b14
duke [Wed, 05 Jul 2017 17:55:40 +0200] rev 10958
Merge
Wed, 05 Jul 2017 17:55:37 +0200 Merge
duke [Wed, 05 Jul 2017 17:55:37 +0200] rev 10957
Merge
Mon, 14 Nov 2011 18:18:59 -0800 Merge
lana [Mon, 14 Nov 2011 18:18:59 -0800] rev 10956
Merge
Mon, 07 Nov 2011 21:52:09 -0800 Merge
asaha [Mon, 07 Nov 2011 21:52:09 -0800] rev 10955
Merge
Tue, 19 Jul 2011 11:05:57 -0700 Merge
asaha [Tue, 19 Jul 2011 11:05:57 -0700] rev 10954
Merge
Tue, 28 Jun 2011 08:39:58 -0700 Merge
asaha [Tue, 28 Jun 2011 08:39:58 -0700] rev 10953
Merge
Mon, 27 Jun 2011 12:29:18 -0700 Merge
asaha [Mon, 27 Jun 2011 12:29:18 -0700] rev 10952
Merge
Mon, 14 Nov 2011 18:16:13 -0800 Merge
lana [Mon, 14 Nov 2011 18:16:13 -0800] rev 10951
Merge
Tue, 08 Nov 2011 11:51:05 -0800 6921494: provide way to print javac tree tag values
jjg [Tue, 08 Nov 2011 11:51:05 -0800] rev 10950
6921494: provide way to print javac tree tag values Reviewed-by: jjg, mcimadamore Contributed-by: vicenterz@yahoo.es
Sat, 05 Nov 2011 00:02:33 -0700 Merge
lana [Sat, 05 Nov 2011 00:02:33 -0700] rev 10949
Merge
Fri, 04 Nov 2011 12:36:40 +0000 7104201: Refactor DocCommentScanner
mcimadamore [Fri, 04 Nov 2011 12:36:40 +0000] rev 10948
7104201: Refactor DocCommentScanner Summary: Add new Comment helper class to parse contents of comments in source code Reviewed-by: jjg
Tue, 01 Nov 2011 15:49:45 -0700 7101933: langtools jtreg tests do not work with jprt on windows
jjh [Tue, 01 Nov 2011 15:49:45 -0700] rev 10947
7101933: langtools jtreg tests do not work with jprt on windows Summary: Fixed langtools/test/Makefile to work on cygwin. Updated jtreg to 4.1 and JCK to JCK8. Reviewed-by: jjg, ohair
Wed, 26 Oct 2011 12:28:51 -0700 Merge
lana [Wed, 26 Oct 2011 12:28:51 -0700] rev 10946
Merge
Tue, 25 Oct 2011 10:52:03 -0700 Merge
lana [Tue, 25 Oct 2011 10:52:03 -0700] rev 10945
Merge
Thu, 10 Nov 2011 11:47:25 -0800 Added tag jdk8-b13 for changeset 7e7229cae97b
katleman [Thu, 10 Nov 2011 11:47:25 -0800] rev 10944
Added tag jdk8-b13 for changeset 7e7229cae97b
Wed, 05 Jul 2017 17:55:30 +0200 Merge
duke [Wed, 05 Jul 2017 17:55:30 +0200] rev 10943
Merge
Mon, 14 Nov 2011 18:16:47 -0800 Merge
lana [Mon, 14 Nov 2011 18:16:47 -0800] rev 10942
Merge
Thu, 10 Nov 2011 13:38:47 -0800 7110676: Update jaf source download url for jaxws
asaha [Thu, 10 Nov 2011 13:38:47 -0800] rev 10941
7110676: Update jaf source download url for jaxws Reviewed-by: ramap
Mon, 07 Nov 2011 21:48:05 -0800 Merge
asaha [Mon, 07 Nov 2011 21:48:05 -0800] rev 10940
Merge
Mon, 25 Jul 2011 11:38:25 -0700 7046794: Configurable behavior for server-side stacktraces
asaha [Mon, 25 Jul 2011 11:38:25 -0700] rev 10939
7046794: Configurable behavior for server-side stacktraces Reviewed-by: ramap
Tue, 19 Jul 2011 11:03:54 -0700 Merge
asaha [Tue, 19 Jul 2011 11:03:54 -0700] rev 10938
Merge
Tue, 28 Jun 2011 08:39:06 -0700 Merge
asaha [Tue, 28 Jun 2011 08:39:06 -0700] rev 10937
Merge
Mon, 27 Jun 2011 11:46:58 -0700 Merge
asaha [Mon, 27 Jun 2011 11:46:58 -0700] rev 10936
Merge
Thu, 10 Nov 2011 11:46:33 -0800 Added tag jdk8-b13 for changeset d4e4b5f54af7
katleman [Thu, 10 Nov 2011 11:46:33 -0800] rev 10935
Added tag jdk8-b13 for changeset d4e4b5f54af7
Wed, 05 Jul 2017 17:55:25 +0200 Merge
duke [Wed, 05 Jul 2017 17:55:25 +0200] rev 10934
Merge
Mon, 14 Nov 2011 18:16:46 -0800 Merge
lana [Mon, 14 Nov 2011 18:16:46 -0800] rev 10933
Merge
Mon, 07 Nov 2011 21:47:57 -0800 Merge
asaha [Mon, 07 Nov 2011 21:47:57 -0800] rev 10932
Merge
Tue, 19 Jul 2011 11:03:46 -0700 Merge
asaha [Tue, 19 Jul 2011 11:03:46 -0700] rev 10931
Merge
Tue, 28 Jun 2011 08:38:58 -0700 Merge
asaha [Tue, 28 Jun 2011 08:38:58 -0700] rev 10930
Merge
Mon, 27 Jun 2011 11:46:49 -0700 Merge
asaha [Mon, 27 Jun 2011 11:46:49 -0700] rev 10929
Merge
Thu, 10 Nov 2011 11:46:28 -0800 Added tag jdk8-b13 for changeset 5002669612fc
katleman [Thu, 10 Nov 2011 11:46:28 -0800] rev 10928
Added tag jdk8-b13 for changeset 5002669612fc
Wed, 05 Jul 2017 17:55:22 +0200 Merge
duke [Wed, 05 Jul 2017 17:55:22 +0200] rev 10927
Merge
Mon, 14 Nov 2011 18:16:31 -0800 Merge
lana [Mon, 14 Nov 2011 18:16:31 -0800] rev 10926
Merge
Mon, 07 Nov 2011 21:45:32 -0800 Merge
asaha [Mon, 07 Nov 2011 21:45:32 -0800] rev 10925
Merge
Tue, 09 Aug 2011 05:39:54 -0700 7055902: Oracle Java IIOP Deserialization Type Confusion Remote Code Execution Vulnerability
mbankal [Tue, 09 Aug 2011 05:39:54 -0700] rev 10924
7055902: Oracle Java IIOP Deserialization Type Confusion Remote Code Execution Vulnerability Reviewed-by: coffeys
Tue, 19 Jul 2011 11:03:26 -0700 Merge
asaha [Tue, 19 Jul 2011 11:03:26 -0700] rev 10923
Merge
Tue, 28 Jun 2011 08:38:30 -0700 Merge
asaha [Tue, 28 Jun 2011 08:38:30 -0700] rev 10922
Merge
Mon, 27 Jun 2011 11:45:52 -0700 Merge
asaha [Mon, 27 Jun 2011 11:45:52 -0700] rev 10921
Merge
Thu, 10 Nov 2011 11:45:56 -0800 Added tag jdk8-b13 for changeset e0e566b9d2b2
katleman [Thu, 10 Nov 2011 11:45:56 -0800] rev 10920
Added tag jdk8-b13 for changeset e0e566b9d2b2
Wed, 05 Jul 2017 17:55:18 +0200 Merge
duke [Wed, 05 Jul 2017 17:55:18 +0200] rev 10919
Merge
Mon, 14 Nov 2011 18:18:22 -0800 Merge
lana [Mon, 14 Nov 2011 18:18:22 -0800] rev 10918
Merge
Mon, 14 Nov 2011 11:52:09 -0800 Merge
asaha [Mon, 14 Nov 2011 11:52:09 -0800] rev 10917
Merge
Fri, 30 Sep 2011 18:47:53 -0700 7096936: issue in jsse/runtime
xuelei [Fri, 30 Sep 2011 18:47:53 -0700] rev 10916
7096936: issue in jsse/runtime 7096937: TEST: com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java need modification as a result of TLS fix Reviewed-by: wetmore, jdn, xuelei
Thu, 29 Sep 2011 17:31:30 -0700 7064341: jsse/runtime security problem
xuelei [Thu, 29 Sep 2011 17:31:30 -0700] rev 10915
7064341: jsse/runtime security problem Reviewed-by: wetmore
Wed, 21 Sep 2011 15:37:52 -0700 7092186: adjust package access in rmiregistry
smarks [Wed, 21 Sep 2011 15:37:52 -0700] rev 10914
7092186: adjust package access in rmiregistry Reviewed-by: asaha, coffeys
Tue, 30 Aug 2011 17:29:36 -0700 7083012: fix for RMI Registry
smarks [Tue, 30 Aug 2011 17:29:36 -0700] rev 10913
7083012: fix for RMI Registry Reviewed-by: jdn, valeriep
Tue, 30 Aug 2011 14:30:03 -0700 7077466: fix for RMI DGC
smarks [Tue, 30 Aug 2011 14:30:03 -0700] rev 10912
7077466: fix for RMI DGC Reviewed-by: valeriep
Fri, 22 Jul 2011 21:14:56 +0400 7019773: AWTKeyStroke.ctor is a mutable static
denis [Fri, 22 Jul 2011 21:14:56 +0400] rev 10911
7019773: AWTKeyStroke.ctor is a mutable static Reviewed-by: art
Wed, 20 Jul 2011 14:45:44 -0700 7023640: calculation for malloc size in TransformHelper.c could overflow an integer
asaha [Wed, 20 Jul 2011 14:45:44 -0700] rev 10910
7023640: calculation for malloc size in TransformHelper.c could overflow an integer Reviewed-by: flar
Wed, 20 Jul 2011 09:01:04 -0700 7032417: Fix for 6981922 does not address multiple VM case
asaha [Wed, 20 Jul 2011 09:01:04 -0700] rev 10909
7032417: Fix for 6981922 does not address multiple VM case Reviewed-by: michaelm
Tue, 19 Jul 2011 11:04:28 -0700 Merge
asaha [Tue, 19 Jul 2011 11:04:28 -0700] rev 10908
Merge
Fri, 15 Jul 2011 13:57:57 -0700 7057857: SIGSEGV [libunpack.so] store_Utf8_char(signed char*, unsigned short) in java.util.jar.pack200
ksrini [Fri, 15 Jul 2011 13:57:57 -0700] rev 10907
7057857: SIGSEGV [libunpack.so] store_Utf8_char(signed char*, unsigned short) in java.util.jar.pack200 Reviewed-by: jrose, asaha, hawtin
Tue, 28 Jun 2011 08:39:36 -0700 Merge
asaha [Tue, 28 Jun 2011 08:39:36 -0700] rev 10906
Merge
Mon, 27 Jun 2011 12:35:31 -0700 Merge
asaha [Mon, 27 Jun 2011 12:35:31 -0700] rev 10905
Merge
Mon, 27 Jun 2011 12:30:30 -0700 Merge
asaha [Mon, 27 Jun 2011 12:30:30 -0700] rev 10904
Merge
Mon, 27 Jun 2011 20:30:40 +0100 7059259: (process) ProcessBuilder.start permission check should be improved when redirecting output to append
alanb [Mon, 27 Jun 2011 20:30:40 +0100] rev 10903
7059259: (process) ProcessBuilder.start permission check should be improved when redirecting output to append Reviewed-by: hawtin
Tue, 21 Jun 2011 20:20:58 +0400 7022113: Security icon can be moved behind the window using the com.sun.SecurityWarning.setPosition() method
anthony [Tue, 21 Jun 2011 20:20:58 +0400] rev 10902
7022113: Security icon can be moved behind the window using the com.sun.SecurityWarning.setPosition() method Reviewed-by: art, dcherepanov
Wed, 15 Jun 2011 14:49:25 +0100 7000600: InputStream.skip() makes sensitive data accessible to malicious code
alanb [Wed, 15 Jun 2011 14:49:25 +0100] rev 10901
7000600: InputStream.skip() makes sensitive data accessible to malicious code Reviewed-by: hawtin, chegar
Mon, 14 Nov 2011 18:15:37 -0800 Merge
lana [Mon, 14 Nov 2011 18:15:37 -0800] rev 10900
Merge
Tue, 08 Nov 2011 15:38:58 -0800 Merge
lana [Tue, 08 Nov 2011 15:38:58 -0800] rev 10899
Merge
Mon, 07 Nov 2011 13:46:02 -0800 7096080: UTF8 update and new CESU-8 charset
sherman [Mon, 07 Nov 2011 13:46:02 -0800] rev 10898
7096080: UTF8 update and new CESU-8 charset 7082884: Incorrect UTF8 conversion for sequence ED 31 7082883: Incorrect UTF8 conversion for sequence fc 80 80 8f bf bf Summary: Updated UTF8 and added CESU-8 to following the latest Standard Reviewed-by: alanb
Sat, 05 Nov 2011 00:00:43 -0700 Merge
lana [Sat, 05 Nov 2011 00:00:43 -0700] rev 10897
Merge
Thu, 03 Nov 2011 13:26:57 -0700 4533691: Add Collections.emptySortedSet()
mduigou [Thu, 03 Nov 2011 13:26:57 -0700] rev 10896
4533691: Add Collections.emptySortedSet() Reviewed-by: mduigou, alanb, dholmes Contributed-by: darryl.mocek@oracle.com
Mon, 31 Oct 2011 17:38:15 -0700 4243978: (ref) Race condition in Reference.enqueue()
ysr [Mon, 31 Oct 2011 17:38:15 -0700] rev 10895
4243978: (ref) Race condition in Reference.enqueue() 4268317: (ref) Reference.isEnqueued() can return true when instance not enqueued Summary: The reference handler now declares, and assumes, that the discovered field, rather than the next field, is (to be) used to link the entries in the pending list, thus allowing a reference object to be safely enqueued even while it is in the pending state. Also added slightly modified regression tests from the two bug reports. Reviewed-by: mchung, alanb, jcoomes
Mon, 31 Oct 2011 16:23:43 -0700 7053252: New regression test does not compile on windows-amd64
wetmore [Mon, 31 Oct 2011 16:23:43 -0700] rev 10894
7053252: New regression test does not compile on windows-amd64 Reviewed-by: valeriep
Mon, 31 Oct 2011 11:54:19 -0700 7105780: Add SSLSocket client/SSLEngine server to templates directory
wetmore [Mon, 31 Oct 2011 11:54:19 -0700] rev 10893
7105780: Add SSLSocket client/SSLEngine server to templates directory Reviewed-by: xuelei
Sun, 30 Oct 2011 20:07:45 -0700 7106277: Brokenness in the seqNumberOverflow of MAC
xuelei [Sun, 30 Oct 2011 20:07:45 -0700] rev 10892
7106277: Brokenness in the seqNumberOverflow of MAC Reviewed-by: wetmore
Sun, 30 Oct 2011 14:53:43 +0000 7103889: (fs) Reduce String concatenation when iterating over directory
alanb [Sun, 30 Oct 2011 14:53:43 +0000] rev 10891
7103889: (fs) Reduce String concatenation when iterating over directory Reviewed-by: alanb Contributed-by: mike.skells@talk21.com
Fri, 28 Oct 2011 07:18:54 -0700 7105940: Test regression: KeyStore must be from provider SunPKCS11-NSSKeyStore
xuelei [Fri, 28 Oct 2011 07:18:54 -0700] rev 10890
7105940: Test regression: KeyStore must be from provider SunPKCS11-NSSKeyStore Reviewed-by: weijun
Thu, 27 Oct 2011 11:01:15 -0400 Merge
mullan [Thu, 27 Oct 2011 11:01:15 -0400] rev 10889
Merge
Thu, 27 Oct 2011 10:57:35 -0400 7094155: JSR105 code throws javax.xml.crypto.URIReferenceException when running into Java 7 VM
mullan [Thu, 27 Oct 2011 10:57:35 -0400] rev 10888
7094155: JSR105 code throws javax.xml.crypto.URIReferenceException when running into Java 7 VM Reviewed-by: xuelei
Thu, 27 Oct 2011 10:32:08 +0100 7099658: Properties.loadFromXML fails with ClassCastException
coffeys [Thu, 27 Oct 2011 10:32:08 +0100] rev 10887
7099658: Properties.loadFromXML fails with ClassCastException Reviewed-by: alanb, mchung
Thu, 27 Oct 2011 17:23:25 +0800 7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu
weijun [Thu, 27 Oct 2011 17:23:25 +0800] rev 10886
7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu Reviewed-by: alanb
Wed, 26 Oct 2011 12:29:22 -0700 Merge
lana [Wed, 26 Oct 2011 12:29:22 -0700] rev 10885
Merge
Tue, 25 Oct 2011 10:51:17 -0700 Merge
lana [Tue, 25 Oct 2011 10:51:17 -0700] rev 10884
Merge
Wed, 26 Oct 2011 22:16:13 +0900 7090046: Lots of invalid link in java.text.BreakIterator comments
peytoia [Wed, 26 Oct 2011 22:16:13 +0900] rev 10883
7090046: Lots of invalid link in java.text.BreakIterator comments Reviewed-by: okutsu
Wed, 26 Oct 2011 13:58:46 +0100 7104650: rawtype warnings in several net, nio and security source files
chegar [Wed, 26 Oct 2011 13:58:46 +0100] rev 10882
7104650: rawtype warnings in several net, nio and security source files Summary: Also reviewed by Ulf.Zibis@gmx.de Reviewed-by: mcimadamore, alanb, dholmes
Tue, 08 Nov 2011 15:37:37 -0800 Merge
lana [Tue, 08 Nov 2011 15:37:37 -0800] rev 10881
Merge
Tue, 08 Nov 2011 14:36:50 +0300 7107585: Test incorrect calculate position of object on frame
rupashka [Tue, 08 Nov 2011 14:36:50 +0300] rev 10880
7107585: Test incorrect calculate position of object on frame Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
Mon, 07 Nov 2011 10:26:52 -0800 Merge
lana [Mon, 07 Nov 2011 10:26:52 -0800] rev 10879
Merge
Mon, 07 Nov 2011 16:50:41 +0400 7080203: JTree.getSelectionPaths() now returns empty array instead of null
rupashka [Mon, 07 Nov 2011 16:50:41 +0400] rev 10878
7080203: JTree.getSelectionPaths() now returns empty array instead of null Reviewed-by: malenkov
Thu, 13 Oct 2011 13:02:37 +0100 7107957: AWT: Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h
ngmr [Thu, 13 Oct 2011 13:02:37 +0100] rev 10877
7107957: AWT: Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h Summary: Use POSIX defined includes for unistd.h and fcntl.h Reviewed-by: anthony, ngmr Contributed-by: Charles Lee <littlee@linux.vnet.ibm.com>
Thu, 03 Nov 2011 14:14:36 +0400 6955919: Intermittent ClassCastException in bug4492274 test
rupashka [Thu, 03 Nov 2011 14:14:36 +0400] rev 10876
6955919: Intermittent ClassCastException in bug4492274 test Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
Wed, 02 Nov 2011 23:53:16 +0300 7049024: DnD fails with JTextArea and JTextField
rupashka [Wed, 02 Nov 2011 23:53:16 +0300] rev 10875
7049024: DnD fails with JTextArea and JTextField Reviewed-by: rupashka Contributed-by: Sean Chou <zhouyx@linux.vnet.ibm.com>
Wed, 02 Nov 2011 17:39:30 +0400 7074853: TransparentRuler demos Readme should mention the correct jar file name
mrkam [Wed, 02 Nov 2011 17:39:30 +0400] rev 10874
7074853: TransparentRuler demos Readme should mention the correct jar file name Reviewed-by: rupashka
Wed, 02 Nov 2011 14:17:16 +0400 6624077: Regression test fails: closed/javax/swing/ToolTipManager/6256140/bug6256140.java
rupashka [Wed, 02 Nov 2011 14:17:16 +0400] rev 10873
6624077: Regression test fails: closed/javax/swing/ToolTipManager/6256140/bug6256140.java Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
Tue, 01 Nov 2011 18:03:56 +0300 7105529: XAWT: Optimize getFieldsAsString() methods generated by WrapperGenerator
anthony [Tue, 01 Nov 2011 18:03:56 +0300] rev 10872
7105529: XAWT: Optimize getFieldsAsString() methods generated by WrapperGenerator Summary: Replace string concatenation with StringBuilder.append() Reviewed-by: anthony, son Contributed-by: Federico Tello Gentile <federicotg@gmail.com>
Tue, 01 Nov 2011 18:01:58 +0300 7104625: sun.awt.X11.XEvent is creating 600 MB of char[] for no good reason
anthony [Tue, 01 Nov 2011 18:01:58 +0300] rev 10871
7104625: sun.awt.X11.XEvent is creating 600 MB of char[] for no good reason Summary: Wrap logging calls with if(){} statements Reviewed-by: anthony, son Contributed-by: Federico Tello Gentile <federicotg@gmail.com>
Mon, 17 Oct 2011 19:06:24 -0700 6887286: StackOverflowError at sun.awt.image.ImageWatched$WeakLink.isWatcher
dbuck [Mon, 17 Oct 2011 19:06:24 -0700] rev 10870
6887286: StackOverflowError at sun.awt.image.ImageWatched$WeakLink.isWatcher Summary: Fixed OffScreenImageSource to call imageComplete() with SINGLEFAMEDONE, not STATICIMAGEDONE. This fixed memory leak (that caused SOFE when we use recursion to iterate over linked list). Reviewed-by: bae
Mon, 17 Oct 2011 17:19:43 +0400 7077293: javax/swing/JComponent/4337267/bug4337267.java failed on windows 2003
rupashka [Mon, 17 Oct 2011 17:19:43 +0400] rev 10869
7077293: javax/swing/JComponent/4337267/bug4337267.java failed on windows 2003 Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
Mon, 17 Oct 2011 16:40:34 +0400 7100004: javax.swing.JTable.setAutoCreateRowSorter(boolean autoCreateRowSorter) should mention default value
rupashka [Mon, 17 Oct 2011 16:40:34 +0400] rev 10868
7100004: javax.swing.JTable.setAutoCreateRowSorter(boolean autoCreateRowSorter) should mention default value Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
Mon, 17 Oct 2011 15:10:42 +0400 7099251: javax.swing.text.html.HTMLDocument.insertAfterStart(null, something) throws NPE
rupashka [Mon, 17 Oct 2011 15:10:42 +0400] rev 10867
7099251: javax.swing.text.html.HTMLDocument.insertAfterStart(null, something) throws NPE Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
Sat, 05 Nov 2011 14:27:47 -0700 Merge
lana [Sat, 05 Nov 2011 14:27:47 -0700] rev 10866
Merge
Fri, 23 Sep 2011 15:18:32 +0100 7105640: Unix printing does not check the result of exec'd lpr/lp command
ngmr [Fri, 23 Sep 2011 15:18:32 +0100] rev 10865
7105640: Unix printing does not check the result of exec'd lpr/lp command Summary: Add checking, exception for spool process failure Reviewed-by: prr, jgodinez Contributed-by: Neil Richards <neil.richards@ngmr.net>
Wed, 26 Oct 2011 17:59:13 -0700 Merge
lana [Wed, 26 Oct 2011 17:59:13 -0700] rev 10864
Merge
(0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip