Wed, 15 Mar 2017 13:02:54 -0700 8171395: (jdeprscan) add comments to L10N message file
smarks [Wed, 15 Mar 2017 13:02:54 -0700] rev 44295
8171395: (jdeprscan) add comments to L10N message file Reviewed-by: ljiang, darcy
Wed, 15 Mar 2017 15:46:43 +0100 8176743: tools/javac/modules/MOptionTest.java test fails on Mac
jlahoda [Wed, 15 Mar 2017 15:46:43 +0100] rev 44294
8176743: tools/javac/modules/MOptionTest.java test fails on Mac Summary: Correctly preferring classfiles over source files when timestamps match. Reviewed-by: jjg
Wed, 15 Mar 2017 06:30:33 -0700 8176778: javadoc does not produce summary pages for aggregated modules
ksrini [Wed, 15 Mar 2017 06:30:33 -0700] rev 44293
8176778: javadoc does not produce summary pages for aggregated modules Reviewed-by: bpatel, jjg
Wed, 15 Mar 2017 11:42:42 +0000 8176534: Missing check against target-type during applicability inference
mcimadamore [Wed, 15 Mar 2017 11:42:42 +0000] rev 44292
8176534: Missing check against target-type during applicability inference Summary: PartiallyInferredMethodType should check against target if unchecked conversion occurred Reviewed-by: vromero
Tue, 14 Mar 2017 10:51:19 +0100 8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile?
jlahoda [Tue, 14 Mar 2017 10:51:19 +0100] rev 44291
8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile? Summary: Clarifications and improvements to jx.a.processing.Filer for creating and reading files in and from modules. Reviewed-by: darcy, jjg
Tue, 14 Mar 2017 08:19:41 +0100 8176045: No compile error when a package is not declared
jlahoda [Tue, 14 Mar 2017 08:19:41 +0100] rev 44290
8176045: No compile error when a package is not declared Summary: Fixing handling of otherwise empty files with package clauses and empty files without package clauses. Reviewed-by: jjg
Tue, 14 Mar 2017 07:11:45 +0100 8175057: module-info on patch path should not produce an error
jlahoda [Tue, 14 Mar 2017 07:11:45 +0100] rev 44289
8175057: module-info on patch path should not produce an error Summary: Allowing module-infos on patch paths during compilation. Reviewed-by: jjg, ksrini
Mon, 13 Mar 2017 17:02:18 -0700 8176539: javadoc ignores module-info files on the command line
ksrini [Mon, 13 Mar 2017 17:02:18 -0700] rev 44288
8176539: javadoc ignores module-info files on the command line Reviewed-by: jjg
Mon, 13 Mar 2017 16:46:17 -0700 8175219: javadoc should exit when it encounters compilation errors.
ksrini [Mon, 13 Mar 2017 16:46:17 -0700] rev 44287
8175219: javadoc should exit when it encounters compilation errors. Reviewed-by: jjg, bpatel
Wed, 05 Jul 2017 23:03:34 +0200 Merge
duke [Wed, 05 Jul 2017 23:03:34 +0200] rev 44286
Merge
Thu, 16 Mar 2017 16:50:51 -0400 8174728: Mark Java EE modules deprecated and for removal
lancea [Thu, 16 Mar 2017 16:50:51 -0400] rev 44285
8174728: Mark Java EE modules deprecated and for removal Reviewed-by: alanb
Thu, 16 Mar 2017 17:55:17 +0000 Merge
lana [Thu, 16 Mar 2017 17:55:17 +0000] rev 44284
Merge
Tue, 14 Mar 2017 15:52:51 -0700 8174977: Update license files with consistent license/notice names
mchung [Tue, 14 Mar 2017 15:52:51 -0700] rev 44283
8174977: Update license files with consistent license/notice names Reviewed-by: alanb, mchung Contributed-by: jeannette.hung@oracle.com
Wed, 05 Jul 2017 23:03:22 +0200 Merge
duke [Wed, 05 Jul 2017 23:03:22 +0200] rev 44282
Merge
Thu, 16 Mar 2017 17:55:56 +0000 Merge
lana [Thu, 16 Mar 2017 17:55:56 +0000] rev 44281
Merge
Tue, 14 Mar 2017 18:56:46 -0700 8176541: XML deprecation "since" values should use 1.x version form for 1.8 and earlier
joehw [Tue, 14 Mar 2017 18:56:46 -0700] rev 44280
8176541: XML deprecation "since" values should use 1.x version form for 1.8 and earlier Reviewed-by: darcy, rriggs, smarks
Tue, 14 Mar 2017 15:52:44 -0700 8174977: Update license files with consistent license/notice names
mchung [Tue, 14 Mar 2017 15:52:44 -0700] rev 44279
8174977: Update license files with consistent license/notice names Reviewed-by: alanb, mchung Contributed-by: jeannette.hung@oracle.com
Wed, 05 Jul 2017 23:03:09 +0200 Merge
duke [Wed, 05 Jul 2017 23:03:09 +0200] rev 44278
Merge
Thu, 16 Mar 2017 17:55:58 +0000 Merge
lana [Thu, 16 Mar 2017 17:55:58 +0000] rev 44277
Merge
Wed, 15 Mar 2017 18:07:31 -0700 8176815: Remove StackFramePermission and use RuntimePermission for stack walking
mchung [Wed, 15 Mar 2017 18:07:31 -0700] rev 44276
8176815: Remove StackFramePermission and use RuntimePermission for stack walking Reviewed-by: alanb, bchristi
Wed, 05 Jul 2017 23:02:58 +0200 Merge
duke [Wed, 05 Jul 2017 23:02:58 +0200] rev 44275
Merge
Mon, 20 Mar 2017 09:18:42 -0700 8177144: sun/net/www/http/HttpClient/B8025710.java should run in ovm mode
coffeys [Mon, 20 Mar 2017 09:18:42 -0700] rev 44274
8177144: sun/net/www/http/HttpClient/B8025710.java should run in ovm mode Reviewed-by: dfuchs, chegar
Fri, 17 Mar 2017 08:38:12 -0700 8176895: (fc) Split java/nio/channels/FileChannel/Transfer.java into smaller tests
bpb [Fri, 17 Mar 2017 08:38:12 -0700] rev 44273
8176895: (fc) Split java/nio/channels/FileChannel/Transfer.java into smaller tests Summary: Move sub-tests writing 4GB and 6GB files into two separate tests Reviewed-by: clanger
Thu, 16 Mar 2017 22:58:13 +0000 8176882: Incorrect integer comparison in version numbers
prappo [Thu, 16 Mar 2017 22:58:13 +0000] rev 44272
8176882: Incorrect integer comparison in version numbers Reviewed-by: psandoz
Thu, 16 Mar 2017 16:56:29 -0400 8174728: Mark Java EE modules deprecated and for removal
lancea [Thu, 16 Mar 2017 16:56:29 -0400] rev 44271
8174728: Mark Java EE modules deprecated and for removal Reviewed-by: alanb
Thu, 16 Mar 2017 13:10:43 -0700 8176886: Remove stray @deprecated in Date#getDate
martin [Thu, 16 Mar 2017 13:10:43 -0700] rev 44270
8176886: Remove stray @deprecated in Date#getDate Reviewed-by: naoto
Thu, 16 Mar 2017 15:40:38 -0400 8176272: (process) ProcessHandle::onExit fails to wait for non-child process
rriggs [Thu, 16 Mar 2017 15:40:38 -0400] rev 44269
8176272: (process) ProcessHandle::onExit fails to wait for non-child process Reviewed-by: chegar, stuefe
Thu, 16 Mar 2017 17:55:22 +0000 Merge
lana [Thu, 16 Mar 2017 17:55:22 +0000] rev 44268
Merge
Thu, 16 Mar 2017 16:56:08 +0000 8176772: jar tool support to report automatic module names
chegar [Thu, 16 Mar 2017 16:56:08 +0000] rev 44267
8176772: jar tool support to report automatic module names Reviewed-by: alanb, mchung
Thu, 16 Mar 2017 08:58:31 -0700 8176846: (fc) Increase timeouts of and instrument some tests using FileChannel#write
bpb [Thu, 16 Mar 2017 08:58:31 -0700] rev 44266
8176846: (fc) Increase timeouts of and instrument some tests using FileChannel#write Summary: Change tests to improve odds of passing on slow file systems. Reviewed-by: clanger, rriggs
Thu, 16 Mar 2017 15:30:54 +0000 8160956: Runtime.Version.compareTo/compareToIgnoreOpt problem
prappo [Thu, 16 Mar 2017 15:30:54 +0000] rev 44265
8160956: Runtime.Version.compareTo/compareToIgnoreOpt problem Reviewed-by: mr
Thu, 16 Mar 2017 14:46:50 +0100 8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
erikj [Thu, 16 Mar 2017 14:46:50 +0100] rev 44264
8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION Reviewed-by: ihse
Wed, 15 Mar 2017 19:24:56 -0700 8176563: @since value errors in apis of java.base/java.logging module
mli [Wed, 15 Mar 2017 19:24:56 -0700] rev 44263
8176563: @since value errors in apis of java.base/java.logging module Reviewed-by: alanb, chegar, dfuchs, dholmes, martin, naoto, rriggs
Wed, 15 Mar 2017 18:08:46 -0700 8176815: Remove StackFramePermission and use RuntimePermission for stack walking
mchung [Wed, 15 Mar 2017 18:08:46 -0700] rev 44262
8176815: Remove StackFramePermission and use RuntimePermission for stack walking Reviewed-by: alanb, bchristi
Wed, 15 Mar 2017 17:17:16 -0700 8066640: clarify security checks in ObjectInputStream.enableResolveObject and ObjectOutputStream.enableReplaceObject
smarks [Wed, 15 Mar 2017 17:17:16 -0700] rev 44261
8066640: clarify security checks in ObjectInputStream.enableResolveObject and ObjectOutputStream.enableReplaceObject Reviewed-by: chegar, darcy
Wed, 15 Mar 2017 22:57:48 +0000 8175251: Failed to load RSA private key from pkcs12
valeriep [Wed, 15 Mar 2017 22:57:48 +0000] rev 44260
8175251: Failed to load RSA private key from pkcs12 Summary: Enhanced DER library with extra arg to control leading-0 check Reviewed-by: mullan
Wed, 15 Mar 2017 23:09:18 +0100 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad [Wed, 15 Mar 2017 23:09:18 +0100] rev 44259
8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709 Reviewed-by: mchung
Wed, 15 Mar 2017 12:58:11 -0700 8176793: SecureRandom FIPS 140-2, Security Requirements for Cryptographic Modules link 404
wetmore [Wed, 15 Mar 2017 12:58:11 -0700] rev 44258
8176793: SecureRandom FIPS 140-2, Security Requirements for Cryptographic Modules link 404 Reviewed-by: mullan
Wed, 15 Mar 2017 19:33:00 +0100 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad [Wed, 15 Mar 2017 19:33:00 +0100] rev 44257
8176709: JarFileSystem::isMultiReleaseJar is incorrect Reviewed-by: mchung, sherman
Tue, 14 Mar 2017 19:44:52 -0700 8176721: @since value errors java.sql module
mli [Tue, 14 Mar 2017 19:44:52 -0700] rev 44256
8176721: @since value errors java.sql module Reviewed-by: lancea
Tue, 14 Mar 2017 19:23:37 -0700 8176566: @since value errors in types of java.base module
mli [Tue, 14 Mar 2017 19:23:37 -0700] rev 44255
8176566: @since value errors in types of java.base module Reviewed-by: martin, psandoz
Wed, 15 Mar 2017 08:09:43 +0800 8176296: Test sun/security/krb5/auto/Basic.java faling after adding module declaration into TEST.properties.
weijun [Wed, 15 Mar 2017 08:09:43 +0800] rev 44254
8176296: Test sun/security/krb5/auto/Basic.java faling after adding module declaration into TEST.properties. Reviewed-by: valeriep
Tue, 14 Mar 2017 16:43:59 -0700 8176744: Improve internal timing of java/nio/channels/Selector/SelectAndClose.java
bpb [Tue, 14 Mar 2017 16:43:59 -0700] rev 44253
8176744: Improve internal timing of java/nio/channels/Selector/SelectAndClose.java Summary: Replace two sleeps with CountDownLatch+sleep and Thread.join() Reviewed-by: rriggs, alanb
Tue, 14 Mar 2017 15:52:41 -0700 8174977: Update license files with consistent license/notice names
mchung [Tue, 14 Mar 2017 15:52:41 -0700] rev 44252
8174977: Update license files with consistent license/notice names Reviewed-by: alanb, mchung Contributed-by: jeannette.hung@oracle.com
Tue, 14 Mar 2017 07:04:50 -0700 8176551: testCommonPoolThreadContextClassLoader fails with "Should throw SecurityException"
dl [Tue, 14 Mar 2017 07:04:50 -0700] rev 44251
8176551: testCommonPoolThreadContextClassLoader fails with "Should throw SecurityException" Reviewed-by: martin, chegar, dholmes, amlu
Tue, 14 Mar 2017 08:35:52 -0400 Merge
mullan [Tue, 14 Mar 2017 08:35:52 -0400] rev 44250
Merge
Tue, 14 Mar 2017 08:35:03 -0400 8176503: Disable SHA-1 TLS Server Certificates
mullan [Tue, 14 Mar 2017 08:35:03 -0400] rev 44249
8176503: Disable SHA-1 TLS Server Certificates Reviewed-by: vinnie, ascarpino
Tue, 14 Mar 2017 20:24:22 +0800 8176715: sun/security/krb5/auto/HttpNegotiateServer.java does not compile
weijun [Tue, 14 Mar 2017 20:24:22 +0800] rev 44248
8176715: sun/security/krb5/auto/HttpNegotiateServer.java does not compile Reviewed-by: mullan
Mon, 13 Mar 2017 13:38:14 -0700 8176221: Preferences docs contain reference to Sun's JRE
bpb [Mon, 13 Mar 2017 13:38:14 -0700] rev 44247
8176221: Preferences docs contain reference to Sun's JRE Summary: Remove reference to "Sun's JRE" and add @implNote Reviewed-by: darcy
Wed, 05 Jul 2017 23:02:42 +0200 Merge
duke [Wed, 05 Jul 2017 23:02:42 +0200] rev 44246
Merge
Thu, 16 Mar 2017 12:09:14 -0700 Merge
jwilhelm [Thu, 16 Mar 2017 12:09:14 -0700] rev 44245
Merge
Sat, 11 Mar 2017 23:23:06 -0800 Merge
jwilhelm [Sat, 11 Mar 2017 23:23:06 -0800] rev 44244
Merge
Wed, 08 Mar 2017 09:04:21 -0500 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel [Wed, 08 Mar 2017 09:04:21 -0500] rev 44243
8176147: JVM should throw CFE for duplicate Signature attributes Summary: Add the needed checks to ClasFileParser for duplicate Signature attributes. Reviewed-by: dholmes, gtriantafill
Tue, 07 Mar 2017 09:32:49 -0800 8176238: [AOT] failure to build jdk.vm.compier with --with-jobs=1 configure flag
kvn [Tue, 07 Mar 2017 09:32:49 -0800] rev 44242
8176238: [AOT] failure to build jdk.vm.compier with --with-jobs=1 configure flag Summary: add --add-modules jdk.internal.vm.ci to Graal annotation process command line. Reviewed-by: iveresov, mchung
Mon, 06 Mar 2017 14:08:52 +0100 8164954: split_if creates empty phi and region nodes
neliasso [Mon, 06 Mar 2017 14:08:52 +0100] rev 44241
8164954: split_if creates empty phi and region nodes Summary: Don't split if all edges will be moved to new phi Reviewed-by: kvn, vlivanov
Mon, 06 Mar 2017 21:28:33 +0100 Merge
jwilhelm [Mon, 06 Mar 2017 21:28:33 +0100] rev 44240
Merge
Mon, 06 Mar 2017 09:45:58 -0500 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel [Mon, 06 Mar 2017 09:45:58 -0500] rev 44239
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set Summary: If bad constant is seen, save it to throw CFE if ACC_MODULE is not in access_flags Reviewed-by: dholmes, acorn, lfoltan, gtriantafill
Sun, 05 Mar 2017 22:25:52 -0800 8172457: JarDirTest.java fails after recent change
iignatyev [Sun, 05 Mar 2017 22:25:52 -0800] rev 44238
8172457: JarDirTest.java fails after recent change Reviewed-by: iveresov
Wed, 05 Jul 2017 23:02:26 +0200 Added tag jdk-10+3 for changeset d1cab6c7e608
duke [Wed, 05 Jul 2017 23:02:26 +0200] rev 44237
Added tag jdk-10+3 for changeset d1cab6c7e608
Wed, 05 Jul 2017 23:02:24 +0200 Merge jdk-10+3
duke [Wed, 05 Jul 2017 23:02:24 +0200] rev 44236
Merge
Wed, 05 Jul 2017 23:02:10 +0200 Merge
duke [Wed, 05 Jul 2017 23:02:10 +0200] rev 44235
Merge
Wed, 05 Jul 2017 23:02:03 +0200 Merge
duke [Wed, 05 Jul 2017 23:02:03 +0200] rev 44234
Merge
Thu, 16 Mar 2017 20:46:52 +0000 Merge
lana [Thu, 16 Mar 2017 20:46:52 +0000] rev 44233
Merge
Thu, 16 Mar 2017 16:34:37 +0000 Added tag jdk-9+161 for changeset 380e1f22e460
lana [Thu, 16 Mar 2017 16:34:37 +0000] rev 44232
Added tag jdk-9+161 for changeset 380e1f22e460
Mon, 13 Mar 2017 19:58:38 +0000 Merge
lana [Mon, 13 Mar 2017 19:58:38 +0000] rev 44231
Merge
Fri, 03 Mar 2017 10:37:53 -0800 8175191: dead code removal at package com.sun.tools.javac.comp
vromero [Fri, 03 Mar 2017 10:37:53 -0800] rev 44230
8175191: dead code removal at package com.sun.tools.javac.comp Reviewed-by: mcimadamore
Wed, 01 Mar 2017 16:38:48 -0800 8167638: javac can improve the error message issued when IllegalAccessError is produced
vromero [Wed, 01 Mar 2017 16:38:48 -0800] rev 44229
8167638: javac can improve the error message issued when IllegalAccessError is produced Reviewed-by: jjg
Wed, 05 Jul 2017 23:01:50 +0200 Merge
duke [Wed, 05 Jul 2017 23:01:50 +0200] rev 44228
Merge
Thu, 16 Mar 2017 20:47:03 +0000 Merge
lana [Thu, 16 Mar 2017 20:47:03 +0000] rev 44227
Merge
Thu, 16 Mar 2017 16:34:35 +0000 Added tag jdk-9+161 for changeset 47c67c6cb823
lana [Thu, 16 Mar 2017 16:34:35 +0000] rev 44226
Added tag jdk-9+161 for changeset 47c67c6cb823
Mon, 13 Mar 2017 19:58:17 +0000 Merge
lana [Mon, 13 Mar 2017 19:58:17 +0000] rev 44225
Merge
Wed, 05 Jul 2017 23:01:36 +0200 Merge
duke [Wed, 05 Jul 2017 23:01:36 +0200] rev 44224
Merge
Thu, 16 Mar 2017 20:47:25 +0000 Merge
lana [Thu, 16 Mar 2017 20:47:25 +0000] rev 44223
Merge
Thu, 16 Mar 2017 16:34:35 +0000 Added tag jdk-9+161 for changeset d6bb701f110a
lana [Thu, 16 Mar 2017 16:34:35 +0000] rev 44222
Added tag jdk-9+161 for changeset d6bb701f110a
Mon, 13 Mar 2017 19:58:33 +0000 Merge
lana [Mon, 13 Mar 2017 19:58:33 +0000] rev 44221
Merge
Wed, 05 Jul 2017 23:01:22 +0200 Merge
duke [Wed, 05 Jul 2017 23:01:22 +0200] rev 44220
Merge
Thu, 16 Mar 2017 20:46:46 +0000 Merge
lana [Thu, 16 Mar 2017 20:46:46 +0000] rev 44219
Merge
Thu, 16 Mar 2017 16:34:37 +0000 Added tag jdk-9+161 for changeset 604022687602
lana [Thu, 16 Mar 2017 16:34:37 +0000] rev 44218
Added tag jdk-9+161 for changeset 604022687602
Mon, 13 Mar 2017 19:59:10 +0000 Merge
lana [Mon, 13 Mar 2017 19:59:10 +0000] rev 44217
Merge
Wed, 05 Jul 2017 23:01:08 +0200 Merge
duke [Wed, 05 Jul 2017 23:01:08 +0200] rev 44216
Merge
Thu, 16 Mar 2017 20:45:59 +0000 Merge
lana [Thu, 16 Mar 2017 20:45:59 +0000] rev 44215
Merge
Thu, 16 Mar 2017 16:34:34 +0000 Added tag jdk-9+161 for changeset 6caed61da28f
lana [Thu, 16 Mar 2017 16:34:34 +0000] rev 44214
Added tag jdk-9+161 for changeset 6caed61da28f
Mon, 13 Mar 2017 19:59:55 +0000 Merge
lana [Mon, 13 Mar 2017 19:59:55 +0000] rev 44213
Merge
Wed, 05 Jul 2017 23:00:54 +0200 Merge
duke [Wed, 05 Jul 2017 23:00:54 +0200] rev 44212
Merge
Thu, 16 Mar 2017 20:46:19 +0000 Merge
lana [Thu, 16 Mar 2017 20:46:19 +0000] rev 44211
Merge
Thu, 16 Mar 2017 16:34:36 +0000 Added tag jdk-9+161 for changeset 725cbaef3403
lana [Thu, 16 Mar 2017 16:34:36 +0000] rev 44210
Added tag jdk-9+161 for changeset 725cbaef3403
Mon, 13 Mar 2017 19:58:52 +0000 Merge
lana [Mon, 13 Mar 2017 19:58:52 +0000] rev 44209
Merge
Fri, 26 Feb 2016 20:55:19 -0500 8150687: typedefs without type names
kbarrett [Fri, 26 Feb 2016 20:55:19 -0500] rev 44208
8150687: typedefs without type names Summary: Removed unnecessary typedef keywords. Reviewed-by: dholmes, bpb
Tue, 28 Feb 2017 02:31:59 +0000 8006259: Add Test Vectors for NIST 800-38A to the JCE Unit Tests
apetcher [Tue, 28 Feb 2017 02:31:59 +0000] rev 44207
8006259: Add Test Vectors for NIST 800-38A to the JCE Unit Tests Summary: added AES Cipher test vectors from Appendix F of NIST 800-38A Reviewed-by: valeriep
Wed, 05 Jul 2017 23:00:39 +0200 Merge
duke [Wed, 05 Jul 2017 23:00:39 +0200] rev 44206
Merge
Thu, 16 Mar 2017 20:47:13 +0000 Merge
lana [Thu, 16 Mar 2017 20:47:13 +0000] rev 44205
Merge
Thu, 16 Mar 2017 16:34:34 +0000 Added tag jdk-9+161 for changeset 9e96ed85ffa4
lana [Thu, 16 Mar 2017 16:34:34 +0000] rev 44204
Added tag jdk-9+161 for changeset 9e96ed85ffa4
Mon, 13 Mar 2017 19:59:41 +0000 Merge
lana [Mon, 13 Mar 2017 19:59:41 +0000] rev 44203
Merge
Thu, 16 Mar 2017 20:45:54 +0000 Merge
lana [Thu, 16 Mar 2017 20:45:54 +0000] rev 44202
Merge
Thu, 16 Mar 2017 16:34:33 +0000 Added tag jdk-9+161 for changeset 673240c54c2e
lana [Thu, 16 Mar 2017 16:34:33 +0000] rev 44201
Added tag jdk-9+161 for changeset 673240c54c2e
Mon, 13 Mar 2017 19:58:08 +0000 Merge
lana [Mon, 13 Mar 2017 19:58:08 +0000] rev 44200
Merge
(0) -30000 -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 tip